X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprivate%2Fwebsites%2Fdenise%2Fevariste.nix;fp=modules%2Fprivate%2Fwebsites%2Fevariste%2Fproduction.nix;h=460302bcb10f7b901636da87acfdcd11e8cb6443;hb=d3452fc59b9839846225fd254926c64a9c71f071;hp=43b26c809e70e0653a07dcb109c43bd0024e2699;hpb=514f9ec3beec470c4445be690673a0ceab9115b4;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/evariste/production.nix b/modules/private/websites/denise/evariste.nix
similarity index 56%
rename from modules/private/websites/evariste/production.nix
rename to modules/private/websites/denise/evariste.nix
index 43b26c8..460302b 100644
--- a/modules/private/websites/evariste/production.nix
+++ b/modules/private/websites/denise/evariste.nix
@@ -1,10 +1,12 @@
-{ lib, pkgs, config,  ... }:
+{ lib, config,  ... }:
 let
-  cfg = config.myServices.websites.evariste.production;
-  nsiVarDir = "/var/lib/ftp/nsievariste";
-  stmgVarDir = "/var/lib/ftp/stmgevariste";
+  cfg = config.myServices.websites.denise.evariste;
+  nsiVarDir = "/var/lib/ftp/denise/nsievariste";
+  stmgVarDir = "/var/lib/ftp/denise/stmgevariste";
+  apacheUser = config.services.httpd.Prod.user;
+  apacheGroup = config.services.httpd.Prod.group;
 in {
-  options.myServices.websites.evariste.production.enable = lib.mkEnableOption "enable NSI/STMG Evariste website";
+  options.myServices.websites.denise.evariste.enable = lib.mkEnableOption "enable NSI/STMG Evariste website";
 
   config = lib.mkIf cfg.enable {
     services.webstats.sites = [
@@ -13,31 +15,32 @@ in {
     ];
 
     services.websites.env.production.modules = [ "proxy_fcgi" ];
-    system.activationScripts.evariste = {
+    system.activationScripts.denise_evariste = {
       deps = [ "httpd" ];
       text = ''
-        install -m 0755 -o wwwrun -g wwwrun -d /var/lib/php/sessions/nsievariste
-        install -m 0755 -o wwwrun -g wwwrun -d /var/lib/php/sessions/stmgevariste
+        install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d /var/lib/php/sessions/denise_nsievariste
+        install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d /var/lib/php/sessions/denise_stmgevariste
         '';
     };
-    services.phpfpm.pools.nsievariste = {
-      user = "wwwrun";
-      group = "wwwrun";
+    services.phpfpm.pools.denise_nsievariste = {
+      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/nsievariste:${nsiVarDir}:/tmp";
-        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/nsievariste";
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/denise_nsievariste:${nsiVarDir}:/tmp";
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/denise_nsievariste";
       };
     };
-    services.websites.env.production.vhostConfs.nsievariste = {
-      certName     = "eldiron";
+    services.websites.env.production.vhostConfs.denise_nsievariste = {
+      certName     = "denise_evariste";
       addToCerts   = true;
+      certMainHost = "nsievariste.immae.eu";
       hosts        = ["nsievariste.immae.eu" ];
       root         = nsiVarDir;
       extraConfig  = [
@@ -45,7 +48,7 @@ in {
         Use Stats nsievariste.immae.eu
 
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${config.services.phpfpm.pools.nsievariste.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.denise_nsievariste.socket}|fcgi://localhost"
         </FilesMatch>
 
         <Directory ${nsiVarDir}>
@@ -58,23 +61,23 @@ in {
       ];
     };
 
-    services.phpfpm.pools.stmgevariste = {
-      user = "wwwrun";
-      group = "wwwrun";
+    services.phpfpm.pools.denise_stmgevariste = {
+      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/stmgevariste:${stmgVarDir}:/tmp";
-        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/stmgevariste";
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/denise_stmgevariste:${stmgVarDir}:/tmp";
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/denise_stmgevariste";
       };
     };
-    services.websites.env.production.vhostConfs.stmgevariste = {
-      certName     = "eldiron";
+    services.websites.env.production.vhostConfs.denise_stmgevariste = {
+      certName     = "denise_evariste";
       addToCerts   = true;
       hosts        = ["stmgevariste.immae.eu" ];
       root         = stmgVarDir;
@@ -83,7 +86,7 @@ in {
         Use Stats stmgevariste.immae.eu
 
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${config.services.phpfpm.pools.stmgevariste.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.denise_stmgevariste.socket}|fcgi://localhost"
         </FilesMatch>
 
         <Directory ${stmgVarDir}>