Move websites/tools to modules

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

diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index c3425bdfd659bc7b4ee4a9c72df24e3a05477a93..1d8488a9eb08cc231ea7d38a8e27a94b2e47d51b 100644 (file)
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -13,15 +13,16 @@ in {
 
   config = lib.mkIf cfg.enable {
     secrets.keys = connexionswing.keys;
-    services.myPhpfpm.preStart.connexionswing_dev = connexionswing.phpFpm.preStart;
-    services.myPhpfpm.serviceDependencies.connexionswing_dev = connexionswing.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing.phpFpm.pool;
-    services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing.phpFpm.phpConfig;
+    systemd.services.phpfpm-connexionswing_dev.after = lib.mkAfter connexionswing.phpFpm.serviceDeps;
+    systemd.services.phpfpm-connexionswing_dev.wants = connexionswing.phpFpm.serviceDeps;
+    systemd.services.phpfpm-connexionswing_dev.preStart = lib.mkAfter connexionswing.phpFpm.preStart;
+    services.phpfpm.pools.connexionswing_dev = {
+      listen = connexionswing.phpFpm.socket;
+      extraConfig = connexionswing.phpFpm.pool;
+      phpOptions = config.services.phpfpm.phpOptions + connexionswing.phpFpm.phpConfig;
+    };
     system.activationScripts.connexionswing_dev = connexionswing.activationScript;
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${connexionswing.app.webRoot} $out/webapps/${connexionswing.apache.webappName}
-      '';
+    myServices.websites.webappDirs."${connexionswing.apache.webappName}" = connexionswing.app.webRoot;
     services.websites.integration.modules = connexionswing.apache.modules;
     services.websites.integration.vhostConfs.connexionswing = {
       certName    = "eldiron";