Refactor websites options

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / tools / default.nix

diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 94a2be164d7fe15d2aef7aaf7d431e5cd5ddafdc..5ca9851175025f18ac6f7bfe723171eac588ffe6 100644 (file)
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -57,10 +57,10 @@ in {
       ++ wallabag.keys
       ++ yourls.keys;
 
-    services.websites.integration.modules =
+    services.websites.env.integration.modules =
       rainloop.apache.modules;
 
-    services.websites.tools.modules =
+    services.websites.env.tools.modules =
       [ "proxy_fcgi" ]
       ++ adminer.apache.modules
       ++ ympd.apache.modules
@@ -74,7 +74,7 @@ in {
       ++ ldap.apache.modules
       ++ kanboard.apache.modules;
 
-    services.websites.integration.vhostConfs.devtools = {
+    services.websites.env.integration.vhostConfs.devtools = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["devtools.immae.eu" ];
@@ -94,7 +94,7 @@ in {
       ];
     };
 
-    services.websites.tools.vhostConfs.tools = {
+    services.websites.env.tools.vhostConfs.tools = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["tools.immae.eu" ];
@@ -124,7 +124,7 @@ in {
       ];
     };
 
-    services.websites.tools.vhostConfs.outils = {
+    services.websites.env.tools.vhostConfs.outils = {
       certName   = "eldiron";
       addToCerts = true;
       hosts      = [ "outils.immae.eu" ];
@@ -212,6 +212,11 @@ in {
       };
     };
 
+    services.filesWatcher.ympd = {
+      restart = true;
+      paths = [ "/var/secrets/mpd" ];
+    };
+
     services.phpfpm.pools.roundcubemail = {
       listen = roundcubemail.phpFpm.socket;
       extraConfig = roundcubemail.phpFpm.pool;
@@ -297,6 +302,13 @@ in {
       "${kanboard.apache.webappName}" = kanboard.webRoot;
     };
 
+    services.websites.env.tools.watchPaths = [
+      "/var/secrets/webapps/tools-wallabag"
+    ];
+    services.filesWatcher.phpfpm-wallabag = {
+      restart = true;
+      paths = [ "/var/secrets/webapps/tools-wallabag" ];
+    };
   };
 }