X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=2f34d27f48ed58396f3a94db5b73247d0c613e8c;hb=b7d2d4e3da7da83bc7f133acaa216375890592b1;hp=076d465bf44986f321b44d864f85c9c7e68847fe;hpb=d4ed0eff6a46d0b1596cf4c68ba7f6abf807bd50;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 076d465..2f34d27 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -8,7 +8,11 @@ let
       inherit (mylibs) fetchedGithub fetchedGit;
       env = myconfig.env.tools.ttrss;
     };
-    roundcubemail = pkgs.callPackage ./roundcubemail.nix { env = myconfig.env.tools.roundcubemail; };
+    roundcubemail = pkgs.callPackage ./roundcubemail.nix {
+      inherit (mylibs) fetchedGithub;
+      env = myconfig.env.tools.roundcubemail;
+    };
+    rainloop = pkgs.callPackage ./rainloop.nix  {};
     kanboard = pkgs.callPackage ./kanboard.nix  {
       inherit (mylibs) fetchedGithub;
       env = myconfig.env.tools.kanboard;
@@ -40,6 +44,19 @@ in {
 
   config = lib.mkIf cfg.enable {
     security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null;
+    security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null;
+
+    deployment.keys =
+      kanboard.keys
+      // ldap.keys
+      // roundcubemail.keys
+      // shaarli.keys
+      // ttrss.keys
+      // wallabag.keys
+      // yourls.keys;
+
+    services.myWebsites.integration.modules =
+      rainloop.apache.modules;
 
     services.myWebsites.tools.modules =
       [ "proxy_fcgi" ]
@@ -57,6 +74,15 @@ in {
 
     services.ympd = ympd.config // { enable = true; };
 
+    services.myWebsites.integration.vhostConfs.devtools = {
+      certName    = "eldiron";
+      hosts       = ["devtools.immae.eu" ];
+      root        = null;
+      extraConfig = [
+        rainloop.apache.vhostConf
+      ];
+    };
+
     services.myWebsites.tools.vhostConfs.tools = {
       certName    = "eldiron";
       hosts       = ["tools.immae.eu" ];
@@ -112,6 +138,21 @@ in {
       ];
     };
 
+    services.myPhpfpm.serviceDependencies = {
+      dokuwiki = dokuwiki.phpFpm.serviceDeps;
+      kanboard = kanboard.phpFpm.serviceDeps;
+      ldap = ldap.phpFpm.serviceDeps;
+      rainloop = rainloop.phpFpm.serviceDeps;
+      roundcubemail = roundcubemail.phpFpm.serviceDeps;
+      shaarli = shaarli.phpFpm.serviceDeps;
+      ttrss = ttrss.phpFpm.serviceDeps;
+      wallabag = wallabag.phpFpm.serviceDeps;
+      yourls = yourls.phpFpm.serviceDeps;
+    };
+
+    services.myPhpfpm.poolPhpConfigs = {
+      roundcubemail = roundcubemail.phpFpm.phpConfig;
+    };
     services.myPhpfpm.poolConfigs = {
       adminer = adminer.phpFpm.pool;
       ttrss = ttrss.phpFpm.pool;
@@ -122,6 +163,7 @@ in {
       shaarli = shaarli.phpFpm.pool;
       dokuwiki = dokuwiki.phpFpm.pool;
       ldap = ldap.phpFpm.pool;
+      rainloop = rainloop.phpFpm.pool;
       kanboard = kanboard.phpFpm.pool;
       tools = ''
         listen = /var/run/phpfpm/tools.sock
@@ -149,6 +191,7 @@ in {
       rompr = rompr.activationScript;
       shaarli = shaarli.activationScript;
       dokuwiki = dokuwiki.activationScript;
+      rainloop = rainloop.activationScript;
       kanboard = kanboard.activationScript;
     };
 
@@ -162,6 +205,7 @@ in {
       ln -s ${ttrss.webRoot} $out/webapps/${ttrss.apache.webappName}
       ln -s ${wallabag.webRoot} $out/webapps/${wallabag.apache.webappName}
       ln -s ${yourls.webRoot} $out/webapps/${yourls.apache.webappName}
+      ln -s ${rainloop.webRoot} $out/webapps/${rainloop.apache.webappName}
       ln -s ${kanboard.webRoot} $out/webapps/${kanboard.apache.webappName}
       '';