X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fbuilder_app.nix;fp=nixops%2Fmodules%2Fwebsites%2Ftellesflorian%2Ftellesflorian.nix;h=e521f6ebfe6e8d2b7c6df46a1e97c8177af2c1b1;hp=59554316c52bf99b71ff5983ce23e133848e5358;hb=f8026b6e4c869aa108f6361c8ccd50890657994d;hpb=4aac110f17f0528d90510eec00c9a8df60bcf04f

diff --git a/nixops/modules/websites/tellesflorian/tellesflorian.nix b/modules/private/websites/florian/builder_app.nix
similarity index 90%
rename from nixops/modules/websites/tellesflorian/tellesflorian.nix
rename to modules/private/websites/florian/builder_app.nix
index 5955431..e521f6e 100644
--- a/nixops/modules/websites/tellesflorian/tellesflorian.nix
+++ b/modules/private/websites/florian/builder_app.nix
@@ -1,11 +1,11 @@
-{ tellesflorian, config }:
+{ apacheUser, apacheGroup, tellesflorian, config }:
 rec {
   app = tellesflorian.override { inherit (config) environment; };
   keys = [
     {
       dest = "webapps/${app.environment}-tellesflorian-passwords";
-      user = apache.user;
-      group = apache.group;
+      user = apacheUser;
+      group = apacheGroup;
       permissions = "0400";
       text = ''
         invite:${config.invite_passwords}
@@ -13,8 +13,8 @@ rec {
     }
     {
       dest = "webapps/${app.environment}-tellesflorian";
-      user = apache.user;
-      group = apache.group;
+      user = apacheUser;
+      group = apacheGroup;
       permissions = "0400";
       text = ''
         # This file is auto-generated during the composer install
@@ -49,10 +49,10 @@ rec {
     socket = "/var/run/phpfpm/floriantelles-${app.environment}.sock";
     pool = ''
       listen = ${socket}
-      user = ${apache.user}
-      group = ${apache.group}
-      listen.owner = ${apache.user}
-      listen.group = ${apache.group}
+      user = ${apacheUser}
+      group = ${apacheGroup}
+      listen.owner = ${apacheUser}
+      listen.group = ${apacheGroup}
       php_admin_value[upload_max_filesize] = 20M
       php_admin_value[post_max_size] = 20M
       ;php_admin_flag[log_errors] = on
@@ -72,8 +72,6 @@ rec {
       ''}'';
   };
   apache = rec {
-    user = "wwwrun";
-    group = "wwwrun";
     modules = [ "proxy_fcgi" ];
     webappName = "florian_${app.environment}";
     root = "/run/current-system/webapps/${webappName}";
@@ -146,9 +144,9 @@ rec {
   activationScript = {
     deps = [ "wrappers" ];
     text = ''
-    install -m 0755 -o ${apache.user} -g ${apache.group} -d ${app.varDir} \
+    install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir} \
       ${app.varDir}/var
-    install -m 0750 -o ${apache.user} -g ${apache.group} -d ${app.varDir}/phpSessions
+    install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions
     '';
   };
 }