Use attrs for secrets instead of lists

[perso/Immae/Config/Nix.git] / modules / private / mail / relay.nix

diff --git a/modules/private/mail/relay.nix b/modules/private/mail/relay.nix
index 52288fc1b13a73a45d69932433de130af2eca2b4..668d3659a919db2edd6da4e44da8642e42707154 100644 (file)
--- a/modules/private/mail/relay.nix
+++ b/modules/private/mail/relay.nix
@@ -13,9 +13,8 @@
         mxs = map (zone: "${config.myEnv.servers."${name}".mx.subdomain}.${zone.name}") zonesWithMx;
       in builtins.listToAttrs (map (mx: lib.attrsets.nameValuePair mx null) mxs);
     };
-    secrets.keys = [
-      {
-        dest = "postfix/mysql_alias_maps";
+    secrets.keys = {
+      "postfix/mysql_alias_maps" = {
         user = config.services.postfix.user;
         group = config.services.postfix.group;
         permissions = "0440";
@@ -41,35 +40,23 @@
               FROM forwardings_blacklisted
               WHERE source = '%s'
           '';
-      }
-      {
-        dest = "postfix/mysql_mailbox_maps";
+      };
+      "postfix/ldap_mailboxes" = {
         user = config.services.postfix.user;
         group = config.services.postfix.group;
         permissions = "0440";
         text = ''
-          # We need to specify that option to trigger ssl connection
-          tls_ciphers = TLSv1.2
-          user = ${config.myEnv.mail.postfix.mysql.user}
-          password = ${config.myEnv.mail.postfix.mysql.password}
-          hosts = ${config.myEnv.mail.postfix.mysql.remoteHost}
-          dbname = ${config.myEnv.mail.postfix.mysql.database}
-          query = SELECT DISTINCT 1
-            FROM mailboxes
-            WHERE active = 1
-            AND (
-              (domain = '%d' AND user = '%u' AND regex = 0)
-              OR (
-                regex = 1
-                AND '%d' REGEXP CONCAT('^',domain,'$')
-                AND '%u' REGEXP CONCAT('^',user,'$')
-              )
-            )
-            LIMIT 1
+          server_host = ldaps://${config.myEnv.mail.dovecot.ldap.host}:636
+          search_base = ${config.myEnv.mail.dovecot.ldap.base}
+          query_filter = ${config.myEnv.mail.dovecot.ldap.postfix_mailbox_filter}
+          bind_dn = ${config.myEnv.mail.dovecot.ldap.dn}
+          bind_pw = ${config.myEnv.mail.dovecot.ldap.password}
+          result_attribute = immaePostfixAddress
+          result_format = dummy
+          version = 3
         '';
-      }
-      {
-        dest = "postfix/sympa_mailbox_maps";
+      };
+      "postfix/sympa_mailbox_maps" = {
         user = config.services.postfix.user;
         group = config.services.postfix.group;
         permissions = "0440";
@@ -78,11 +65,22 @@
           user = ${config.myEnv.mail.sympa.postgresql.user}
           password = ${config.myEnv.mail.sympa.postgresql.password}
           dbname = ${config.myEnv.mail.sympa.postgresql.database}
-          query = SELECT DISTINCT CONCAT(name_list, '@', robot_list) FROM list_table
+          query = SELECT DISTINCT 1 FROM list_table WHERE '%s' IN (
+              CONCAT(name_list, '@', robot_list),
+              CONCAT(name_list, '-request@', robot_list),
+              CONCAT(name_list, '-editor@', robot_list),
+              CONCAT(name_list, '-unsubscribe@', robot_list),
+              CONCAT(name_list, '-owner@', robot_list),
+              CONCAT('sympa-request@', robot_list),
+              CONCAT('sympa-owner@', robot_list),
+              CONCAT('sympa@', robot_list),
+              CONCAT('listmaster@', robot_list),
+              CONCAT('bounce@', robot_list),
+              CONCAT('abuse-feedback-report@', robot_list)
+            )
         '';
-      }
-      {
-        dest = "postfix/ldap_ejabberd_users_immae_fr";
+      };
+      "postfix/ldap_ejabberd_users_immae_fr" = {
         user = config.services.postfix.user;
         group = config.services.postfix.group;
         permissions = "0440";
@@ -97,8 +95,8 @@
           result_format = ejabberd@localhost
           version = 3
           '';
-      }
-    ];
+      };
+    };
 
     networking.firewall.allowedTCPPorts = [ 25 ];
 
@@ -107,9 +105,9 @@
       restart = true;
       paths = [
         config.secrets.fullPaths."postfix/mysql_alias_maps"
-        config.secrets.fullPaths."postfix/mysql_mailbox_maps"
         config.secrets.fullPaths."postfix/sympa_mailbox_maps"
         config.secrets.fullPaths."postfix/ldap_ejabberd_users_immae_fr"
+        config.secrets.fullPaths."postfix/ldap_mailboxes"
       ];
     };
     services.postfix = {
@@ -151,12 +149,8 @@
             )
           );
         };
-        sasl_access = {
-          host_dummy_mailboxes = pkgs.writeText "host-virtual-mailbox"
-            (builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v: "${n}@immae.eu  1") nodes));
-        };
       in
-        recipient_maps // relay_restrictions // virtual_map // sasl_access;
+        recipient_maps // relay_restrictions // virtual_map;
       config = {
         ### postfix module overrides
         readme_directory = "${pkgs.postfix}/share/postfix/doc";
@@ -194,8 +188,7 @@
             "ldap:${config.secrets.fullPaths."postfix/ldap_ejabberd_users_immae_fr"}"
           ];
           virtual_mailbox_maps = [
-            "hash:/etc/postfix/host_dummy_mailboxes"
-            "mysql:${config.secrets.fullPaths."postfix/mysql_mailbox_maps"}"
+            "ldap:${config.secrets.fullPaths."postfix/ldap_mailboxes"}"
             "pgsql:${config.secrets.fullPaths."postfix/sympa_mailbox_maps"}"
           ];
         in