Swap over email to chankillo

diff --git a/pri/combined-dehnerts.zone b/pri/combined-dehnerts.zone
index d97530e1c1af26be1cec27ff7d8f080ec2720feb..109a01d422dd3be7e768be21f36b1a0e6c493e9d 100644 (file)
--- a/pri/combined-dehnerts.zone
+++ b/pri/combined-dehnerts.zone
@@ -1,6 +1,6 @@
 $TTL 300
 @       IN      SOA     ns root (
-                                    2023072702 ; Serial
+                                    2023072706 ; Serial
                                     4h         ; slave refresh
                                     15m        ; slave retry time in case of a problem
                                     4w         ; slave expiration time
@@ -15,7 +15,7 @@ $TTL 300
        IN      NS      ns4.linode.com.
        IN      NS      ns5.linode.com.
        IN      A       18.18.208.22
-       IN      MX      10      mail
+       IN      MX      10      smtp
 ;      IN      MX      20      adehnert3.xvm.mit.edu.
 ; SPF
         IN    TXT       "v=spf1 mx a ~all"
@@ -26,11 +26,11 @@ $TTL 300
 
 ; Spam filtering
 olinda-202207._domainkey        IN      TXT     ( "v=DKIM1; t=y; h=sha256; k=rsa; "
-          "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmY9SdH535aHo7xO2TdTTzvJJiGe5YRonZpoAJNJjNRmGuzYEr3CPeJ1wkVbAWIbYg4ZQXlWMaUpbS63UI1widngx+r5sUIBc1Ib/Vyg/XgSND5ZQ/QksNEFobnGafWh+0cd6GKcgBfFi2KZaYdGjsToD0Kosl7fZI4dOocG9yKdLP7PbwFN87cyKHC9y7/XvytphjomHxUDtRp"
-          "saKFHa5N5F1oASmW4gnnyNWHcmVpanknlTmiTHLrNPcTDhC0ODYAB5RFmeO49+fHBaK1q4ZE9jnSHraPm8lz0wba9XCaUs9CJ1MEh+SJNjE/td5p2m9LR0HxX6N6mC0zzN+VDPdwIDAQAB" )  ; ----- DKIM key olinda-202207 for localhost
-adehnert-test-d-202307._domainkey       IN      TXT     ( "v=DKIM1; h=sha256; k=rsa; "
-          "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2BG4abdXLgH3S2PuVWWXdukSQiGbHwsk0MnDGcAQOGivH3vAtwJ42nS8rgzV8QJfnGLvAeo4E0Mg5OPeMMrFcqaBE6gNg2u88HREcv7ExhXWGDirlqPI2zc1fNzHOjlTXkJ+B1cJApeqJQl/mpfybWj9cUIJjeO+jj0XhAEYI95kpdWqhPRdVglWQ8OLVmhL4nCQuISiLBHyZk"
-          "d97nqJz+ni7t5dv2lSIrsvyJ92zV0Lfeqe3rlwX2UW79x+hF6VCGaBGSNwkl+jfLKzqiG4VVIlARjQJTMJpiohxX+7Evdw2s+Y3vDVpHwbUcBbZtTW+EdxFgsXN3m10vdvy9cjpQIDAQAB" )  ; ----- DKIM key adehnert-test-d-202307 for localhost
+        "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmY9SdH535aHo7xO2TdTTzvJJiGe5YRonZpoAJNJjNRmGuzYEr3CPeJ1wkVbAWIbYg4ZQXlWMaUpbS63UI1widngx+r5sUIBc1Ib/Vyg/XgSND5ZQ/QksNEFobnGafWh+0cd6GKcgBfFi2KZaYdGjsToD0Kosl7fZI4dOocG9yKdLP7PbwFN87cyKHC9y7/XvytphjomHxUDtRp"
+        "saKFHa5N5F1oASmW4gnnyNWHcmVpanknlTmiTHLrNPcTDhC0ODYAB5RFmeO49+fHBaK1q4ZE9jnSHraPm8lz0wba9XCaUs9CJ1MEh+SJNjE/td5p2m9LR0HxX6N6mC0zzN+VDPdwIDAQAB" )  ; ----- DKIM key olinda-202207 for localhost
+chankillo-202307._domainkey     IN      TXT     ( "v=DKIM1; h=sha256; k=rsa; "
+        "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJbpbveUiOmnI5h5Lc7w0OGZ5cVD8ODsp23MKtHDK5WmNel4+9K1zROEGBx60UaG09oIJqyy97QDZYXhmvOCtJlrXnqe5dOLmvHUJps6whw8iGygAvhBkkit9w0T9EcCAZS32g333B8MDJlKboNZiwBQxIBd6mXvoLvns+NFY083422XsWNq7BgTiNfzS0SZG5QJWpAbdYUZPh"
+        "aqokmQllHogRfPgrfmz68otJvnVGX6WzW+LDBI+a58BJleTd5NYKmbKkbvFvhT7n+Ynenjo6ksisFvQ4dHIcoyBlVFxFYPWHUvYSKCt7ysMrmTNOyvX2SEFqY6TlktNlo6ojJTcwIDAQAB" )  ; ----- DKIM key chankillo-202307 for localhost
 _dmarc  IN      TXT     "v=DMARC1;p=none;sp=none;pct=100;rua=mailto:dmarcreports@dehnerts.com;"
 
 
@@ -68,17 +68,17 @@ dd-printer      IN  A   192.168.2.11
 tikal  IN      A       192.168.1.27
 
 ; Most services
-mail   IN      A       18.18.208.12
+mail   IN      A       18.18.208.22
 _acme-challenge.mail    IN  CNAME _acme-challenge.mail.dynamic
 mail2  IN      CNAME   adehnert3.xvm.mit.edu.
 mail-pi        IN      CNAME   duck-dacha
-imap    IN      CNAME   olinda
-*.imap  IN      CNAME   olinda
+imap    IN      CNAME   chankillo
 _acme-challenge.imap    IN  CNAME _acme-challenge.imap.dynamic
-pop     IN      CNAME   olinda
-*.pop   IN      CNAME   olinda
+*.imap  IN      CNAME   chankillo
+pop     IN      CNAME   chankillo
 _acme-challenge.pop    IN  CNAME _acme-challenge.pop.dynamic
-smtp   IN      A       18.18.208.12
+*.pop   IN      CNAME   chankillo
+smtp   IN      A       18.18.208.22
 _acme-challenge.smtp    IN  CNAME _acme-challenge.smtp.dynamic
 ns     IN      A       18.18.208.22
 ns1     IN      A       18.18.208.22