Change dmarc and disable mx-1 until ready

diff --git a/nixops/modules/dns/default.nix b/nixops/modules/dns/default.nix
index 34019d11fbfde857c1b1246fc84c3cef83f24dd6..0096f554833f3401e802f5acb01b2f2a2d9a7c72 100644 (file)
--- a/nixops/modules/dns/default.nix
+++ b/nixops/modules/dns/default.nix
@@ -106,11 +106,11 @@
               ''
               ; ------------------ mail: ${n} ---------------------------
               ${if e.receive then "${n} IN MX 10 mail.${conf.name}." else ""}
-              ${if e.receive then "${n} IN MX 50 mx-1.${conf.name}." else ""}
+              ;${if e.receive then "${n} IN MX 50 mx-1.${conf.name}." else ""}
 
               ; Mail sender authentications
               ${n}                   IN TXT  "v=spf1 mx ~all"
-              _dmarc${suffix}              IN TXT  "v=DMARC1; p=quarantine; adkim=r; aspf=r; fo=1; rua=mailto:postmaster@immae.eu; ruf=mailto:postmaster@immae.eu;"
+              _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;"
               ${if e.send then ''
               immae_eu._domainkey${suffix} IN TXT  ( "v=DKIM1; k=rsa; s=email; "
                         "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzl3vLd8W5YAuumC5+ZT9OV7/14Pmh5JYtwyqKI3cfe9NnAqInt3xO4bZ7oqIxRKWN4SD39vm7O/QOvFdBt00ENOOzdP90s5gKw6eIP/4+vPTh0IWltAsmu9B2agzdtWUE7t2xFKIzEn8l9niRE2QYbVaqZv4sub98vY55fIgFoHtjkmNC7325S8fjDJGp6OPbyhAs6Xl5/adjF"