X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=5b368e07a1e5195a37899d359fb956b982bc910b;hb=afcc5de071dfffdc507995d1845372ba40dc1dc2;hp=9908d9935da41da3e8d9aa6eeb9985fa6a8a5a3a;hpb=2f16a987d306cdb7bf9b4e80fa4af173373719bd;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 9908d99..5b368e0 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -10,11 +10,6 @@ let
     inherit (pkgs.webapps) ttrss ttrss-plugins;
     env = myconfig.env.tools.ttrss;
   };
-  roundcubemail = pkgs.callPackage ./roundcubemail.nix {
-    inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins;
-    env = myconfig.env.tools.roundcubemail;
-  };
-  rainloop = pkgs.callPackage ./rainloop.nix  {};
   kanboard = pkgs.callPackage ./kanboard.nix  {
     env = myconfig.env.tools.kanboard;
   };
@@ -51,21 +46,16 @@ in {
     secrets.keys =
       kanboard.keys
       ++ ldap.keys
-      ++ roundcubemail.keys
       ++ shaarli.keys
       ++ ttrss.keys
       ++ wallabag.keys
       ++ yourls.keys;
 
-    services.websites.env.integration.modules =
-      rainloop.apache.modules;
-
     services.websites.env.tools.modules =
       [ "proxy_fcgi" ]
       ++ adminer.apache.modules
       ++ ympd.apache.modules
       ++ ttrss.apache.modules
-      ++ roundcubemail.apache.modules
       ++ wallabag.apache.modules
       ++ yourls.apache.modules
       ++ rompr.apache.modules
@@ -90,7 +80,6 @@ in {
             </FilesMatch>
           </Directory>
           ''
-        rainloop.apache.vhostConf
       ];
     };
 
@@ -101,6 +90,8 @@ in {
       root        = "/var/lib/ftp/tools.immae.eu";
       extraConfig = [
         ''
+          RedirectMatch 301 ^/roundcube(.*)$   https://mail.immae.eu/roundcube$1
+
           <Directory "/var/lib/ftp/tools.immae.eu">
             DirectoryIndex index.php index.htm index.html
             AllowOverride all
@@ -113,7 +104,6 @@ in {
         adminer.apache.vhostConf
         ympd.apache.vhostConf
         ttrss.apache.vhostConf
-        roundcubemail.apache.vhostConf
         wallabag.apache.vhostConf
         yourls.apache.vhostConf
         rompr.apache.vhostConf
@@ -145,6 +135,8 @@ in {
 
         RedirectMatch 301 ^/taskweb(.*)$     https://task.immae.eu/taskweb$1
 
+        RedirectMatch 301 ^/roundcube(.*)$   https://mail.immae.eu/roundcube$1
+
         RedirectMatch 301 ^/(.*)$            https://tools.immae.eu/$1
         ''
       ];
@@ -163,14 +155,6 @@ in {
         after = lib.mkAfter ldap.phpFpm.serviceDeps;
         wants = ldap.phpFpm.serviceDeps;
       };
-      phpfpm-rainloop = {
-        after = lib.mkAfter rainloop.phpFpm.serviceDeps;
-        wants = rainloop.phpFpm.serviceDeps;
-      };
-      phpfpm-roundcubemail = {
-        after = lib.mkAfter roundcubemail.phpFpm.serviceDeps;
-        wants = roundcubemail.phpFpm.serviceDeps;
-      };
       phpfpm-shaarli = {
         after = lib.mkAfter shaarli.phpFpm.serviceDeps;
         wants = shaarli.phpFpm.serviceDeps;
@@ -217,12 +201,6 @@ in {
       paths = [ "/var/secrets/mpd" ];
     };
 
-    services.phpfpm.pools.roundcubemail = {
-      listen = roundcubemail.phpFpm.socket;
-      extraConfig = roundcubemail.phpFpm.pool;
-      phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig;
-    };
-
     services.phpfpm.pools.devtools = {
       listen = "/var/run/phpfpm/devtools.sock";
       extraConfig = ''
@@ -254,7 +232,6 @@ 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
@@ -277,13 +254,11 @@ in {
     system.activationScripts = {
       adminer = adminer.activationScript;
       ttrss = ttrss.activationScript;
-      roundcubemail = roundcubemail.activationScript;
       wallabag = wallabag.activationScript;
       yourls = yourls.activationScript;
       rompr = rompr.activationScript;
       shaarli = shaarli.activationScript;
       dokuwiki = dokuwiki.activationScript;
-      rainloop = rainloop.activationScript;
       kanboard = kanboard.activationScript;
       ldap = ldap.activationScript;
     };
@@ -293,12 +268,10 @@ in {
       "${dokuwiki.apache.webappName}" = dokuwiki.webRoot;
       "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs";
       "${rompr.apache.webappName}" = rompr.webRoot;
-      "${roundcubemail.apache.webappName}" = roundcubemail.webRoot;
       "${shaarli.apache.webappName}" = shaarli.webRoot;
       "${ttrss.apache.webappName}" = ttrss.webRoot;
       "${wallabag.apache.webappName}" = wallabag.webRoot;
       "${yourls.apache.webappName}" = yourls.webRoot;
-      "${rainloop.apache.webappName}" = rainloop.webRoot;
       "${kanboard.apache.webappName}" = kanboard.webRoot;
     };