X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fapp.nix;h=55fb3cb232d03fec08ca67659d3e4729089eb1e4;hb=17f6eae9907a122d4472da727ae8b1ac1c40c027;hp=08506e101a36ed05dd766f72e5b64acb09fec884;hpb=f8026b6e4c869aa108f6361c8ccd50890657994d;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 08506e1..55fb3cb 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -15,14 +15,12 @@ in {
 
   config = lib.mkIf cfg.enable {
     secrets.keys = tellesflorian.keys;
-    services.myPhpfpm.preStart.tellesflorian_dev = tellesflorian.phpFpm.preStart;
-    services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool;
+    systemd.services.phpfpm-tellesflorian_dev.after = lib.mkAfter tellesflorian.phpFpm.serviceDeps;
+    systemd.services.phpfpm-tellesflorian_dev.wants = tellesflorian.phpFpm.serviceDeps;
+    systemd.services.phpfpm-tellesflorian_dev.preStart = lib.mkAfter tellesflorian.phpFpm.preStart;
+    services.phpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool;
     system.activationScripts.tellesflorian_dev = tellesflorian.activationScript;
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${tellesflorian.app.webRoot} $out/webapps/${tellesflorian.apache.webappName}
-      '';
+    myServices.websites.webappDirs."${tellesflorian.apache.webappName}" = tellesflorian.app.webRoot;
     services.websites.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules;
     services.websites.integration.vhostConfs.tellesflorian = {
       certName    = "eldiron";
@@ -34,5 +32,9 @@ in {
         adminer.apache.vhostConf
       ];
     };
+    services.filesWatcher.phpfpm-tellesflorian_dev = {
+      restart = true;
+      paths = [ "/var/secrets/webapps/${tellesflorian.app.environment}-tellesflorian" ];
+    };
   };
 }