Implement mta-sts and move mail services to specific domain

3 files changed, 4 insertions, 215 deletions

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;
     };
 
diff --git a/modules/private/websites/tools/tools/rainloop.nix b/modules/private/websites/tools/tools/rainloop.nix
deleted file mode 100644
index dbf0f24..0000000
--- a/modules/private/websites/tools/tools/rainloop.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ lib, pkgs, writeText, stdenv, fetchurl }:
-rec {
-  varDir = "/var/lib/rainloop";
-  activationScript = {
-    deps = [ "wrappers" ];
-    text = ''
-      install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir}
-      install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
-      install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/data
-    '';
-  };
-  webRoot = pkgs.rainloop-community.override { dataPath = "${varDir}/data"; };
-  apache = rec {
-    user = "wwwrun";
-    group = "wwwrun";
-    modules = [ "proxy_fcgi" ];
-    webappName = "tools_rainloop";
-    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
-    Alias /rainloop "${root}"
-    <Directory "${root}">
-      DirectoryIndex index.php
-      AllowOverride All
-      Options -FollowSymlinks
-      Require all granted
-
-      <FilesMatch "\.php$">
-        SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-      </FilesMatch>
-    </Directory>
-
-    <DirectoryMatch "${root}/data">
-      Require all denied
-    </DirectoryMatch>
-    '';
-  };
-  phpFpm = rec {
-    serviceDeps = [ "postgresql.service" ];
-    basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
-    socket = "/var/run/phpfpm/rainloop.sock";
-    pool = ''
-      listen = ${socket}
-      user = ${apache.user}
-      group = ${apache.group}
-      listen.owner = ${apache.user}
-      listen.group = ${apache.group}
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-
-      ; Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = RainloopPHPSESSID
-      php_admin_value[upload_max_filesize] = 200M
-      php_admin_value[post_max_size] = 200M
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
-      '';
-  };
-}
diff --git a/modules/private/websites/tools/tools/roundcubemail.nix b/modules/private/websites/tools/tools/roundcubemail.nix
deleted file mode 100644
index 8bb60d6..0000000
--- a/modules/private/websites/tools/tools/roundcubemail.nix
+++ /dev/null
@@ -1,125 +0,0 @@
-{ env, roundcubemail, roundcubemail-plugins, roundcubemail-skins, phpPackages, apacheHttpd }:
-rec {
-  varDir = "/var/lib/roundcubemail";
-  activationScript = {
-    deps = [ "wrappers" ];
-    text = ''
-      install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \
-        ${varDir}/cache ${varDir}/logs
-      install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
-    '';
-  };
-  keys = [{
-    dest = "webapps/tools-roundcube";
-    user = apache.user;
-    group = apache.group;
-    permissions = "0400";
-    text = ''
-      <?php
-        $config['db_dsnw'] = '${env.psql_url}';
-        $config['default_host'] = 'ssl://imap.immae.eu';
-        $config['username_domain'] = array(
-          "imap.immae.eu" => "mail.immae.eu"
-        );
-        $config['imap_conn_options'] = array("ssl" => array("verify_peer" => false));
-        $config['smtp_server'] = 'tls://smtp.immae.eu';
-        $config['smtp_port'] = '587';
-        $config['managesieve_host'] = 'imap.immae.eu';
-        $config['managesieve_port'] = '4190';
-        $config['managesieve_usetls'] = true;
-        $config['managesieve_conn_options'] = array("ssl" => array("verify_peer" => false));
-
-        $config['imap_cache'] = 'db';
-        $config['messages_cache'] = 'db';
-
-        $config['support_url'] = ''';
-
-        $config['des_key'] = '${env.secret}';
-
-        $config['skin'] = 'elastic';
-        $config['plugins'] = array(
-          'attachment_reminder',
-          'emoticons',
-          'filesystem_attachments',
-          'hide_blockquote',
-          'identicon',
-          'identity_select',
-          'jqueryui',
-          'markasjunk',
-          'managesieve',
-          'newmail_notifier',
-          'vcard_attachments',
-          'zipdownload',
-
-          'automatic_addressbook',
-          'message_highlight',
-          'carddav',
-          // Ne marche pas ?: 'ident_switch',
-          // Ne marche pas ?: 'thunderbird_labels',
-        );
-
-        $config['language'] = 'fr_FR';
-
-        $config['drafts_mbox'] = 'Drafts';
-        $config['junk_mbox'] = 'Junk';
-        $config['sent_mbox'] = 'Sent';
-        $config['trash_mbox'] = 'Trash';
-        $config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
-        $config['draft_autosave'] = 60;
-        $config['enable_installer'] = false;
-        $config['log_driver'] = 'file';
-        $config['temp_dir'] = '${varDir}/cache';
-        $config['mime_types'] = '${apacheHttpd}/conf/mime.types';
-    '';
-  }];
-  webRoot = (roundcubemail.override { roundcube_config = "/var/secrets/webapps/tools-roundcube"; }).withPlugins
-    (builtins.attrValues roundcubemail-plugins) (builtins.attrValues roundcubemail-skins);
-  apache = rec {
-    user = "wwwrun";
-    group = "wwwrun";
-    modules = [ "proxy_fcgi" ];
-    webappName = "tools_roundcubemail";
-    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
-    Alias /roundcube "${root}"
-    <Directory "${root}">
-        DirectoryIndex index.php
-        AllowOverride All
-        Options FollowSymlinks
-        Require all granted
-
-        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-        </FilesMatch>
-      </Directory>
-      '';
-  };
-  phpFpm = rec {
-    serviceDeps = [ "postgresql.service" ];
-    basedir = builtins.concatStringsSep ":" (
-      [ webRoot "/var/secrets/webapps/tools-roundcube" varDir ]
-      ++ webRoot.plugins
-      ++ webRoot.skins);
-    phpConfig = ''
-      date.timezone = 'CET'
-      extension=${phpPackages.imagick}/lib/php/extensions/imagick.so
-      '';
-    socket = "/var/run/phpfpm/roundcubemail.sock";
-    pool = ''
-      user = ${apache.user}
-      group = ${apache.group}
-      listen.owner = ${apache.user}
-      listen.group = ${apache.group}
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
-
-      ; Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = RoundcubemailPHPSESSID
-      php_admin_value[upload_max_filesize] = 200M
-      php_admin_value[post_max_size] = 200M
-      php_admin_value[open_basedir] = "${basedir}:${apacheHttpd}/conf/mime.types:/tmp"
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
-      '';
-  };
-}