X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fjerome%2Fnaturaloutil.nix;fp=modules%2Fprivate%2Fwebsites%2Fnaturaloutil%2Fproduction.nix;h=8bbb49e64cc57700cefefc5a246cd8f9c10fcbf8;hp=1e79141d1c5aa0268db1f373e6167ccbdeb5217e;hb=d3452fc59b9839846225fd254926c64a9c71f071;hpb=514f9ec3beec470c4445be690673a0ceab9115b4

diff --git a/modules/private/websites/naturaloutil/production.nix b/modules/private/websites/jerome/naturaloutil.nix
similarity index 67%
rename from modules/private/websites/naturaloutil/production.nix
rename to modules/private/websites/jerome/naturaloutil.nix
index 1e79141..8bbb49e 100644
--- a/modules/private/websites/naturaloutil/production.nix
+++ b/modules/private/websites/jerome/naturaloutil.nix
@@ -1,11 +1,14 @@
 { lib, pkgs, config,  ... }:
 let
   adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
-  cfg = config.myServices.websites.naturaloutil.production;
+  cfg = config.myServices.websites.jerome.naturaloutil;
   varDir = "/var/lib/ftp/jerome";
   env = config.myEnv.websites.jerome;
+  apacheUser = config.services.httpd.Prod.user;
+  apacheGroup = config.services.httpd.Prod.group;
+  secretsPath = config.secrets.fullPaths."websites/jerome/naturaloutil";
 in {
-  options.myServices.websites.naturaloutil.production.enable = lib.mkEnableOption "enable Naturaloutil's website";
+  options.myServices.websites.jerome.naturaloutil.enable = lib.mkEnableOption "enable Jerome Naturaloutil's website";
 
   config = lib.mkIf cfg.enable {
     services.webstats.sites = [ { name = "naturaloutil.immae.eu"; } ];
@@ -13,9 +16,9 @@ in {
     security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
 
     secrets.keys = [{
-      dest = "webapps/prod-naturaloutil";
-      user = "wwwrun";
-      group = "wwwrun";
+      dest = "websites/jerome/naturaloutil";
+      user = apacheUser;
+      group = apacheGroup;
       permissions = "0400";
       text = ''
         <?php
@@ -33,38 +36,38 @@ in {
         ?>
       '';
     }];
-    system.activationScripts.naturaloutil = {
+    system.activationScripts.jerome_naturaloutil = {
       deps = [ "httpd" ];
       text = ''
-        install -m 0755 -o wwwrun -g wwwrun -d /var/lib/php/sessions/naturaloutil
+        install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d /var/lib/php/sessions/jerome_naturaloutil
         '';
     };
-    systemd.services.phpfpm-jerome.after = lib.mkAfter [ "mysql.service" ];
-    systemd.services.phpfpm-jerome.wants = [ "mysql.service" ];
-    services.phpfpm.pools.jerome = {
-      user = "wwwrun";
-      group = "wwwrun";
+    systemd.services.phpfpm-jerome_naturaloutil.after = lib.mkAfter [ "mysql.service" ];
+    systemd.services.phpfpm-jerome_naturaloutil.wants = [ "mysql.service" ];
+    services.phpfpm.pools.jerome_naturaloutil = {
+      user = apacheUser;
+      group = apacheGroup;
       settings = {
-        "listen.owner" = "wwwrun";
-        "listen.group" = "wwwrun";
+        "listen.owner" = apacheUser;
+        "listen.group" = apacheGroup;
 
         "pm" = "ondemand";
         "pm.max_children" = "5";
         "pm.process_idle_timeout" = "60";
 
-        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/naturaloutil:/var/secrets/webapps/prod-naturaloutil:${varDir}:/tmp";
-        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/naturaloutil";
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/jerome_naturaloutil:${secretsPath}:${varDir}:/tmp";
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/jerome_naturaloutil";
       };
       phpEnv = {
-        BDD_CONNECT = "/var/secrets/webapps/prod-naturaloutil";
+        BDD_CONNECT = secretsPath;
       };
       phpOptions = config.services.phpfpm.phpOptions + ''
         extension=${pkgs.php}/lib/php/extensions/mysqli.so
         '';
     };
     services.websites.env.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ];
-    services.websites.env.production.vhostConfs.naturaloutil = {
-      certName     = "naturaloutil";
+    services.websites.env.production.vhostConfs.jerome_naturaloutil = {
+      certName     = "jerome";
       certMainHost = "naturaloutil.immae.eu";
       hosts        = ["naturaloutil.immae.eu" ];
       root         = varDir;
@@ -77,7 +80,7 @@ in {
         CustomLog "${varDir}/logs/access_log" combined
 
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${config.services.phpfpm.pools.jerome.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.jerome_naturaloutil.socket}|fcgi://localhost"
         </FilesMatch>
 
         <Directory ${varDir}/logs>