Refactor websites options

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

diff --git a/modules/private/websites/ludivinecassal/production.nix b/modules/private/websites/ludivinecassal/production.nix
index c5de698265fc39d6e0fb2926c130256ecafff8f8..9d8407de3e9b8a8d4b685f0e329bf397d57c9f03 100644 (file)
--- a/modules/private/websites/ludivinecassal/production.nix
+++ b/modules/private/websites/ludivinecassal/production.nix
@@ -15,21 +15,23 @@ in {
     secrets.keys = ludivinecassal.keys;
     services.webstats.sites = [ { name = "ludivinecassal.com"; } ];
 
-    services.myPhpfpm.preStart.ludivinecassal_prod = ludivinecassal.phpFpm.preStart;
-    services.myPhpfpm.serviceDependencies.ludivinecassal_prod = ludivinecassal.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal.phpFpm.pool;
+    systemd.services.phpfpm-ludivinecassal_prod.after = lib.mkAfter ludivinecassal.phpFpm.serviceDeps;
+    systemd.services.phpfpm-ludivinecassal_prod.wants = ludivinecassal.phpFpm.serviceDeps;
+    systemd.services.phpfpm-ludivinecassal_prod.preStart = lib.mkAfter ludivinecassal.phpFpm.preStart;
+    services.phpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal.phpFpm.pool;
     system.activationScripts.ludivinecassal_prod = ludivinecassal.activationScript;
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${ludivinecassal.app.webRoot} $out/webapps/${ludivinecassal.apache.webappName}
-      '';
-    services.websites.production.modules = ludivinecassal.apache.modules;
-    services.websites.production.vhostConfs.ludivine = {
+    myServices.websites.webappDirs."${ludivinecassal.apache.webappName}" = ludivinecassal.app.webRoot;
+    services.websites.env.production.modules = ludivinecassal.apache.modules;
+    services.websites.env.production.vhostConfs.ludivine = {
       certName     = "ludivinecassal";
       certMainHost = "ludivinecassal.com";
       hosts        = ["ludivinecassal.com" "www.ludivinecassal.com" ];
       root         = ludivinecassal.apache.root;
       extraConfig  = [ ludivinecassal.apache.vhostConf ];
     };
+    services.filesWatcher.phpfpm-ludivinecassal_prod = {
+      restart = true;
+      paths = [ "/var/secrets/webapps/${ludivinecassal.app.environment}-ludivinecassal" ];
+    };
   };
 }