Refactor websites

[perso/Immae/Config/Nix.git] / modules / private / websites / telio_tortay / production.nix

diff --git a/modules/private/websites/teliotortay/production.nix b/modules/private/websites/telio_tortay/production.nix
similarity index 64%
rename from modules/private/websites/teliotortay/production.nix
rename to modules/private/websites/telio_tortay/production.nix
index 62762ec7606c1002251668064a550a18d4f4e9b5..130f4dbf9e757f6f5f9172e8047c7998fd73f777 100644 (file)
--- a/modules/private/websites/teliotortay/production.nix
+++ b/modules/private/websites/telio_tortay/production.nix
@@ -1,39 +1,41 @@
 { lib, pkgs, config,  ... }:
 let
   adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
-  cfg = config.myServices.websites.telioTortay.production;
+  cfg = config.myServices.websites.telio_tortay.production;
   varDir = "/var/lib/ftp/telio_tortay";
-  env = config.myEnv.websites.telioTortay;
+  env = config.myEnv.websites.telio_tortay;
+  apacheUser = config.services.httpd.Prod.user;
+  apacheGroup = config.services.httpd.Prod.group;
 in {
-  options.myServices.websites.telioTortay.production.enable = lib.mkEnableOption "enable Telio Tortay's website";
+  options.myServices.websites.telio_tortay.production.enable = lib.mkEnableOption "enable Telio Tortay's website";
 
   config = lib.mkIf cfg.enable {
     services.webstats.sites = [ { name = "telio-tortay.immae.eu"; } ];
 
     security.acme.certs."ftp".extraDomains."telio-tortay.immae.eu" = null;
 
-    system.activationScripts.telio-tortay = {
+    system.activationScripts.telio_tortay = {
       deps = [ "httpd" ];
       text = ''
-        install -m 0755 -o wwwrun -g wwwrun -d /var/lib/ftp/telio_tortay/logs
-        install -m 0755 -o wwwrun -g wwwrun -d /var/lib/php/sessions/telio-tortay
+        install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d /var/lib/ftp/telio_tortay/logs
+        install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d /var/lib/php/sessions/telio_tortay
         '';
     };
-    systemd.services.phpfpm-telio-tortay.after = lib.mkAfter [ "mysql.service" ];
-    systemd.services.phpfpm-telio-tortay.wants = [ "mysql.service" ];
-    services.phpfpm.pools.telio-tortay = {
-      user = "wwwrun";
-      group = "wwwrun";
+    systemd.services.phpfpm-telio_tortay.after = lib.mkAfter [ "mysql.service" ];
+    systemd.services.phpfpm-telio_tortay.wants = [ "mysql.service" ];
+    services.phpfpm.pools.telio_tortay = {
+      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/telio-tortay:${varDir}:/tmp";
-        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/telio-tortay";
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/telio_tortay:${varDir}:/tmp";
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/telio_tortay";
       };
       phpOptions = config.services.phpfpm.phpOptions + ''
         disable_functions = "mail"
@@ -41,8 +43,8 @@ in {
         '';
     };
     services.websites.env.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ];
-    services.websites.env.production.vhostConfs.telio-tortay = {
-      certName     = "telio-tortay";
+    services.websites.env.production.vhostConfs.telio_tortay = {
+      certName     = "telio_tortay";
       certMainHost = "telio-tortay.immae.eu";
       hosts        = ["telio-tortay.immae.eu" "realistesmedia.fr" "www.realistesmedia.fr" ];
       root         = varDir;
@@ -55,7 +57,7 @@ in {
         CustomLog "${varDir}/logs/access_log" combined
 
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${config.services.phpfpm.pools.telio-tortay.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.telio_tortay.socket}|fcgi://localhost"
         </FilesMatch>
 
         <Directory ${varDir}/logs>