From 05f8c21a6f756a7ae7d9ec95e422f1f1a1c7e030 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 9 Jun 2019 12:38:50 +0200
Subject: [PATCH] Add imap / pop3 / smtp subdomains to dns

---
 modules/private/dns.nix                                | 9 +++++++++
 modules/private/websites/tools/tools/roundcubemail.nix | 7 ++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/private/dns.nix b/modules/private/dns.nix
index af53695..f12f982 100644
--- a/modules/private/dns.nix
+++ b/modules/private/dns.nix
@@ -108,6 +108,14 @@
               ${n} IN MX 10 mail.${conf.name}.
               ;${n} IN MX 50 mx-1.${conf.name}.
 
+              ; https://tools.ietf.org/html/rfc6186
+              _submission._tcp${suffix} SRV  0 1  587 smtp.immae.eu.
+              _imap._tcp${suffix}       SRV  0 1  143 imap.immae.eu.
+              _imaps._tcp${suffix}      SRV  0 1  993 imap.immae.eu.
+              _pop3._tcp${suffix}       SRV 10 1  110 pop3.immae.eu.
+              _pop3s._tcp${suffix}      SRV 10 1  995 pop3.immae.eu.
+              _sieve._tcp${suffix}      SRV  0 1 4190 imap.immae.eu.
+
               ; Mail sender authentications
               ${n}                   IN TXT  "v=spf1 mx ~all"
               _dmarc${suffix}              IN TXT  "v=DMARC1; p=none; adkim=r; aspf=r; fo=1; rua=mailto:postmaster+rua@immae.eu; ruf=mailto:postmaster+ruf@immae.eu;"
@@ -115,6 +123,7 @@
               immae_eu._domainkey${suffix} IN TXT  ( "v=DKIM1; k=rsa; s=email; "
                         "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzl3vLd8W5YAuumC5+ZT9OV7/14Pmh5JYtwyqKI3cfe9NnAqInt3xO4bZ7oqIxRKWN4SD39vm7O/QOvFdBt00ENOOzdP90s5gKw6eIP/4+vPTh0IWltAsmu9B2agzdtWUE7t2xFKIzEn8l9niRE2QYbVaqZv4sub98vY55fIgFoHtjkmNC7325S8fjDJGp6OPbyhAs6Xl5/adjF"
                         "0ko4Y2p6RaxLQfjlS0bxmK4Qg6C14pIXHtzVeqOuWrwApqt5+AULSn97iUtqV/IJlEEjC6DUR44t3C/G0G/k46iFclCqRRi0hdPrOHCtZDbtMubnTN9eaUiNpkXh1WnCflHwtjQwIDAQAB" )
+              eldiron._domainkey${suffix}  IN TXT  ${myconfig.env.mail.dkim.eldiron.public}
               '' else ""}
               '') conf.withEmail)}
               '' + (if conf.name == "immae.eu" then ''
diff --git a/modules/private/websites/tools/tools/roundcubemail.nix b/modules/private/websites/tools/tools/roundcubemail.nix
index 8974d1b..c643ff6 100644
--- a/modules/private/websites/tools/tools/roundcubemail.nix
+++ b/modules/private/websites/tools/tools/roundcubemail.nix
@@ -17,11 +17,12 @@ rec {
     text = ''
       <?php
         $config['db_dsnw'] = '${env.psql_url}';
+        // This is used as default @domain, don't use "imap.immae.eu" here!
         $config['default_host'] = 'ssl://mail.immae.eu';
         $config['imap_conn_options'] = array("ssl" => array("verify_peer" => false));
-        $config['smtp_server'] = 'tls://mail.immae.eu';
-        $config['smtp_port'] = '25';
-        $config['managesieve_host'] = 'mail.immae.eu';
+        $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));
-- 
2.41.0