X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Faten%2Fbuilder.nix;fp=nixops%2Fmodules%2Fwebsites%2Faten%2Faten.nix;h=9a2e1a7de24709054f410b8d0f538335cd0d0238;hb=f8026b6e4c869aa108f6361c8ccd50890657994d;hp=04876a1a2afc95b3c2bc58338b87abe06dfd51bb;hpb=4aac110f17f0528d90510eec00c9a8df60bcf04f;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/aten/aten.nix b/modules/private/websites/aten/builder.nix
similarity index 84%
rename from nixops/modules/websites/aten/aten.nix
rename to modules/private/websites/aten/builder.nix
index 04876a1..9a2e1a7 100644
--- a/nixops/modules/websites/aten/aten.nix
+++ b/modules/private/websites/aten/builder.nix
@@ -1,4 +1,4 @@
-{ aten, lib, config }: rec {
+{ apacheUser, apacheGroup, aten, lib, config }: rec {
   app = aten.override { inherit (config) environment; };
   phpFpm = rec {
     preStart = ''
@@ -7,7 +7,7 @@
           "${app}" != "$(cat ${app.varDir}/currentWebappDir 2>/dev/null)" ] \
           || ! sha512sum -c --status ${app.varDir}/currentKey; then
         pushd ${app} > /dev/null
-        /run/wrappers/bin/sudo -u wwwrun APP_ENV=${app.environment} ./bin/console --env=${app.environment} cache:clear --no-warmup
+        /run/wrappers/bin/sudo -u ${apacheUser} APP_ENV=${app.environment} ./bin/console --env=${app.environment} cache:clear --no-warmup
         popd > /dev/null
         echo -n "${app}" > ${app.varDir}/currentWebappDir
         sha512sum /var/secrets/webapps/${app.environment}-aten > ${app.varDir}/currentKey
@@ -17,10 +17,10 @@
     socket = "/var/run/phpfpm/aten-${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
@@ -41,8 +41,8 @@
   };
   keys = [{
     dest = "webapps/${app.environment}-aten";
-    user = apache.user;
-    group = apache.group;
+    user = apacheUser;
+    group = apacheGroup;
     permissions = "0400";
     text = ''
       SetEnv APP_ENV      "${app.environment}"
@@ -51,8 +51,6 @@
       '';
   }];
   apache = rec {
-    user = "wwwrun";
-    group = "wwwrun";
     modules = [ "proxy_fcgi" ];
     webappName = "aten_${app.environment}";
     root = "/run/current-system/webapps/${webappName}";
@@ -97,8 +95,8 @@
   activationScript = {
     deps = [ "wrappers" ];
     text = ''
-    install -m 0755 -o ${apache.user} -g ${apache.group} -d ${app.varDir}
-    install -m 0750 -o ${apache.user} -g ${apache.group} -d ${app.varDir}/phpSessions
+    install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}
+    install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions
     '';
   };
 }