Move integration php applications to dedicated module

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

diff --git a/modules/private/websites/connexionswing/production.nix b/modules/private/websites/connexionswing/production.nix
index 8f28f462abef6bff896e382069183aff22213978..07647da266534568c68e3774ff7f095a2b56a97c 100644 (file)
--- a/modules/private/websites/connexionswing/production.nix
+++ b/modules/private/websites/connexionswing/production.nix
@@ -15,23 +15,28 @@ in {
     secrets.keys = connexionswing.keys;
     services.webstats.sites = [ { name = "connexionswing.com"; } ];
 
-    services.myPhpfpm.preStart.connexionswing_prod = connexionswing.phpFpm.preStart;
-    services.myPhpfpm.serviceDependencies.connexionswing_prod = connexionswing.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing.phpFpm.pool;
-    services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing.phpFpm.phpConfig;
+    systemd.services.phpfpm-connexionswing_prod.after = lib.mkAfter connexionswing.phpFpm.serviceDeps;
+    systemd.services.phpfpm-connexionswing_prod.wants = connexionswing.phpFpm.serviceDeps;
+    systemd.services.phpfpm-connexionswing_prod.preStart = lib.mkAfter connexionswing.phpFpm.preStart;
+    services.phpfpm.pools.connexionswing_prod = {
+      listen = connexionswing.phpFpm.socket;
+      extraConfig = connexionswing.phpFpm.pool;
+      phpOptions = config.services.phpfpm.phpOptions + connexionswing.phpFpm.phpConfig;
+    };
     system.activationScripts.connexionswing_prod = connexionswing.activationScript;
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${connexionswing.app.webRoot} $out/webapps/${connexionswing.apache.webappName}
-      '';
-    services.websites.production.modules = connexionswing.apache.modules;
-    services.websites.production.vhostConfs.connexionswing = {
+    myServices.websites.webappDirs."${connexionswing.apache.webappName}" = connexionswing.app.webRoot;
+    services.websites.env.production.modules = connexionswing.apache.modules;
+    services.websites.env.production.vhostConfs.connexionswing = {
       certName     = "connexionswing";
       certMainHost = "connexionswing.com";
       hosts        = ["connexionswing.com" "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
       root         = connexionswing.apache.root;
       extraConfig  = [ connexionswing.apache.vhostConf ];
     };
+    services.filesWatcher.phpfpm-connexionswing_prod = {
+      restart = true;
+      paths = [ "/var/secrets/webapps/${connexionswing.app.environment}-connexionswing" ];
+    };
   };
 }