X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fapp.nix;h=00fe6448d93f263f29652a32c8effd3af5b2bda1;hb=29f8cb850d74b456d6481a456311bbf5361d328c;hp=905c66a0be44f5d41a4346f6fbbf4525bc618a86;hpb=f40f5b235b890f46770a22f005f8a0f664cf0562;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 905c66a..00fe644 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -20,12 +20,9 @@ in {
     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}
-      '';
-    services.websites.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules;
-    services.websites.integration.vhostConfs.tellesflorian = {
+    myServices.websites.webappDirs."${tellesflorian.apache.webappName}" = tellesflorian.app.webRoot;
+    services.websites.env.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules;
+    services.websites.env.integration.vhostConfs.tellesflorian = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["app.tellesflorian.com" ];
@@ -35,5 +32,9 @@ in {
         adminer.apache.vhostConf
       ];
     };
+    services.filesWatcher.phpfpm-tellesflorian_dev = {
+      restart = true;
+      paths = [ "/var/secrets/webapps/${tellesflorian.app.environment}-tellesflorian" ];
+    };
   };
 }