X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fchloe%2Fbuilder.nix;fp=nixops%2Fmodules%2Fwebsites%2Fchloe%2Fchloe.nix;h=7b72b9706fb38d9e0cff97914363f32af59a055f;hp=2847b9d9baffd1b38c8b21040414379daf466737;hb=f8026b6e4c869aa108f6361c8ccd50890657994d;hpb=4aac110f17f0528d90510eec00c9a8df60bcf04f

diff --git a/nixops/modules/websites/chloe/chloe.nix b/modules/private/websites/chloe/builder.nix
similarity index 85%
rename from nixops/modules/websites/chloe/chloe.nix
rename to modules/private/websites/chloe/builder.nix
index 2847b9d..7b72b97 100644
--- a/nixops/modules/websites/chloe/chloe.nix
+++ b/modules/private/websites/chloe/builder.nix
@@ -1,4 +1,4 @@
-{ chloe, config }:
+{ apacheUser, apacheGroup, chloe, config }:
 rec {
   app = chloe.override { inherit (config) environment; };
   phpFpm = rec {
@@ -6,10 +6,10 @@ rec {
     socket = "/var/run/phpfpm/chloe-${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
@@ -29,8 +29,8 @@ rec {
   };
   keys = [{
     dest = "webapps/${app.environment}-chloe";
-    user = apache.user;
-    group = apache.group;
+    user = apacheUser;
+    group = apacheGroup;
     permissions = "0400";
     text = ''
       SetEnv SPIP_CONFIG_DIR     "${configDir}"
@@ -49,8 +49,6 @@ rec {
     '';
   }];
   apache = rec {
-    user = "wwwrun";
-    group = "wwwrun";
     modules = [ "proxy_fcgi" ];
     webappName = "chloe_${app.environment}";
     root = "/run/current-system/webapps/${webappName}";
@@ -97,9 +95,9 @@ rec {
   activationScript = {
     deps = [ "wrappers" ];
     text = ''
-      install -m 0755 -o ${apache.user} -g ${apache.group} -d ${app.varDir} ${app.varDir}/IMG ${app.varDir}/tmp ${app.varDir}/local
-      install -m 0750 -o ${apache.user} -g ${apache.group} -d ${app.varDir}/phpSessions
+      install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir} ${app.varDir}/IMG ${app.varDir}/tmp ${app.varDir}/local
+      install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions
     '';
   };
-  configDir = ./chloe_config_ + app.environment;
+  configDir = ./config;
 }