X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=aa59e280d6c254c930b9c3ebf54f2b894acdfdf8;hb=e2ca51b2f47652f64b497e53249c29ad4b96a6e9;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..aa59e28 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,10 @@ in {
 
   config = lib.mkIf cfg.enable {
     security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null;
+    security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null;
+
+    services.myWebsites.integration.modules =
+      rainloop.apache.modules;
 
     services.myWebsites.tools.modules =
       [ "proxy_fcgi" ]
@@ -57,6 +65,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 +129,7 @@ in {
       ];
     };
 
+    services.myPhpfpm.poolPhpConfigs.roundcubemail = roundcubemail.phpFpm.phpConfig;
     services.myPhpfpm.poolConfigs = {
       adminer = adminer.phpFpm.pool;
       ttrss = ttrss.phpFpm.pool;
@@ -122,6 +140,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 +168,7 @@ in {
       rompr = rompr.activationScript;
       shaarli = shaarli.activationScript;
       dokuwiki = dokuwiki.activationScript;
+      rainloop = rainloop.activationScript;
       kanboard = kanboard.activationScript;
     };
 
@@ -162,6 +182,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}
       '';