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

diff --git a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix b/modules/private/websites/piedsjaloux/builder.nix
similarity index 89%
rename from nixops/modules/websites/piedsjaloux/piedsjaloux.nix
rename to modules/private/websites/piedsjaloux/builder.nix
index 97f8946..9fcc8fb 100644
--- a/nixops/modules/websites/piedsjaloux/piedsjaloux.nix
+++ b/modules/private/websites/piedsjaloux/builder.nix
@@ -1,11 +1,11 @@
-{ piedsjaloux, config, pkgs, lib, texlive, imagemagick }:
+{ apacheUser, apacheGroup, piedsjaloux, config, pkgs, lib, texlive, imagemagick }:
 rec {
   app = piedsjaloux.override { inherit (config) environment; };
   varDir = "/var/lib/piedsjaloux_${app.environment}";
   keys = [{
     dest = "webapps/${app.environment}-piedsjaloux";
-    user = apache.user;
-    group = apache.group;
+    user = apacheUser;
+    group = apacheGroup;
     permissions = "0400";
     text = ''
       # This file is auto-generated during the composer install
@@ -33,7 +33,7 @@ rec {
           "${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 ./bin/console --env=${app.environment} cache:clear --no-warmup
+        /run/wrappers/bin/sudo -u ${apacheUser} ./bin/console --env=${app.environment} cache:clear --no-warmup
         popd > /dev/null
         echo -n "${app}" > ${app.varDir}/currentWebappDir
         sha512sum /var/secrets/webapps/${app.environment}-piedsjaloux > ${app.varDir}/currentKey
@@ -43,10 +43,10 @@ rec {
     socket = "/var/run/phpfpm/piedsjaloux-${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
@@ -67,8 +67,6 @@ rec {
       ''}'';
   };
   apache = rec {
-    user = "wwwrun";
-    group = "wwwrun";
     modules = [ "proxy_fcgi" ];
     webappName = "piedsjaloux_${app.environment}";
     root = "/run/current-system/webapps/${webappName}";
@@ -138,9 +136,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}/tmp
-    install -m 0750 -o ${apache.user} -g ${apache.group} -d ${app.varDir}/phpSessions
+    install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions
     '';
   };
 }