Zonen aufgeräumt

diff --git a/bind/zones/brehm-online.com.zone b/bind/zones/brehm-online.com.zone
index d47842447ec2f357100dd033edb6a734e6a42005..f8983dd2caaf7aba63a14532f099ae9493de9538 100644 (file)
--- a/bind/zones/brehm-online.com.zone
+++ b/bind/zones/brehm-online.com.zone
@@ -4,7 +4,7 @@ $TTL 86400      ; 1 day
 ;$TTL 900
 
 brehm-online.com       SOA     ns.uhu-banane.de. hostmaster.uhu-banane.de. (
-                               2016072500 ; serial
+                               2016072800 ; serial
                                10800      ; refresh (3 hours)
                                3600       ; retry (1 hour)
                                604800     ; expire (1 week)
@@ -41,9 +41,7 @@ dyn                   NS      ns3.uhu-banane.de.
                        NS      ns1.uhu-banane.de.
 dyndns                 CNAME   helga
 fotoalbum              CNAME   helga
-ftp                    CNAME   helga
 git                    CNAME   ns3.uhu-banane.de.
-gitlab                 CNAME   uhu-23-1.uhu-banane.de.
 imap                   CNAME   mail
 helga                  A       85.214.134.152
                        AAAA    2a01:238:4225:6e00:8f8c:808a:7fb8:88df
@@ -56,16 +54,17 @@ home                        NS      ns3.uhu-banane.de.
 ;                      NS      home-gw.brehm-online.com.
 home-gw                        AAAA    2001:6f8:1c00:365::2
 home.bruni             A       10.12.11.2
+imap                   CNAME   mail.uhu-banane.net.
 kfz-dlb                        CNAME   helga
 www.kfz-dlb            CNAME   helga
 ldap                   CNAME   helga
 ldapdmin               CNAME   helga
-mail                   A       85.214.134.152
-mail                   AAAA    2a01:238:4225:6e00:8f8c:808a:7fb8:88df
+mail                   CNAME   mail.uhu-banane.net.
+mx                     CNAME   mail.uhu-banane.net.
 myadmin                        CNAME   helga
 ;ns                    A       85.214.73.141
-ns                     A       85.214.134.152
-ns                     AAAA    2a01:238:4225:6e00:8f8c:808a:7fb8:88df
+ns                     A       185.102.95.107
+                       AAAA    2a06:2380:0:1::3a
 ns1                    CNAME   ns1.uhu-banane.de.
 ns2                    CNAME   ns2.uhu-banane.de.
 ns3                    CNAME   ns3.uhu-banane.de.
@@ -73,10 +72,10 @@ online                      CNAME   helga
 pop3                   CNAME   mail
 ;samara                        AAAA    2001:4dd0:ff00:cd3::2
 sarah                  CNAME   sarah.uhu-banane.de.
-smtp                   CNAME   mail
+smtp                   CNAME   mail.uhu-banane.net.
 ;strato                        MX      10 mail.strato
 ;strato.mail           A       192.166.192.180
-svn                    CNAME   helga
+;svn                   CNAME   helga
 ;webdav                        CNAME   helga
 ;uhu                   A       46.16.73.178
 uhu1                   CNAME   uhu1.uhu-banane.de.
@@ -85,12 +84,12 @@ uhu3                        CNAME   uhu3.uhu-banane.de.
 uhu4                   CNAME   uhu4.uhu-banane.de.
 uhu8                   CNAME   uhu-deb8-1.uhu-banane.de.
 uhu-deb8-1             CNAME   uhu-deb8-1.uhu-banane.de.
-uhu-15-1               CNAME   uhu-15-1.uhu-banane.de.
-uhu-15-2               CNAME   uhu-15-2.uhu-banane.de.
-uhu-15-3               CNAME   uhu-15-3.uhu-banane.de.
-uhu-23-1               CNAME   uhu-23-1.uhu-banane.de.
-uhu27-jessie           CNAME   uhu27-jessie.uhu-banane.de.
-webmail                        CNAME   helga
+;uhu-15-1              CNAME   uhu-15-1.uhu-banane.de.
+;uhu-15-2              CNAME   uhu-15-2.uhu-banane.de.
+;uhu-15-3              CNAME   uhu-15-3.uhu-banane.de.
+;uhu-23-1              CNAME   uhu-23-1.uhu-banane.de.
+;uhu27-jessie          CNAME   uhu27-jessie.uhu-banane.de.
+webmail                        CNAME   mail.uhu-banane.net.
 www                    CNAME   helga
 www-test               CNAME   helga
 ;groupoffice           CNAME   helga

diff --git a/bind/zones/uhu-banane.de.zone b/bind/zones/uhu-banane.de.zone
index 45b0b1eaf1da624f7aaf948b80cb19a94adeb296..ae829380827052f419aa30782d68536f57100a41 100644 (file)
--- a/bind/zones/uhu-banane.de.zone
+++ b/bind/zones/uhu-banane.de.zone
@@ -2,7 +2,7 @@ $ORIGIN .
 $TTL 86400     ; 1 day
 ;$TTL 900
 uhu-banane.de          SOA     ns.uhu-banane.de. hostmaster.uhu-banane.de. (
-                               2016072400 ; serial
+                               2016072800 ; serial
                                10800      ; refresh (3 hours)
                                3600       ; retry (1 hour)
                                604800     ; expire (1 week)
@@ -38,26 +38,17 @@ edda                        A       138.201.28.135
                        AAAA    2a01:4f8:171:3006::2
 egroupware             CNAME   uhu1
 fotoalbum              CNAME   helga.brehm-online.com.
-ftp                    CNAME   uhu-banane.de.
 git                    CNAME   ns3
-gitlab                 CNAME   uhu-23-1
 ;home                  NS      bruni.brehm-online.com.
 kfz-dlb                        CNAME   helga.brehm-online.com.
 www.kfz-dlb            CNAME   helga.brehm-online.com.
 ldap                   CNAME   ns3
 ldapadmin              CNAME   ns3
 liz                    CNAME   edda
-mail                   A       85.214.134.152
-                       AAAA    2a01:238:4225:6e00:8f8c:808a:7fb8:88df
-mail4                  A       85.214.134.152
-mail6                  AAAA    2a01:238:4225:6e00:8f8c:808a:7fb8:88df
+mail                   CNAME   mail.uhu-banane.net.
 maria                  CNAME   maria.acwain.net.
-minion-debian          A       10.12.24.12
-minion-gentoo          A       10.12.24.13
-mx                     A       185.48.118.130
+mx                     CNAME   mail.uhu-banane.net.
 myadmin                        CNAME   helga.brehm-online.com.
-;ns                    A       85.214.134.152
-;                      AAAA    2a01:238:4225:6e00:8f8c:808a:7fb8:88df
 ns                     A       185.102.95.107
                        AAAA    2a06:2380:0:1::3a
 ns1                    A       185.48.118.128
@@ -81,12 +72,12 @@ uhu4                        A       78.137.97.80
 uhu4-local             A       10.12.24.1
 uhu8                   CNAME   uhu-deb8-1
 uhu-deb8-1             A       78.137.99.67
-uhu-15-1               A       208.94.38.109
-uhu-15-2               A       162.254.25.200
-uhu-15-3               A       208.94.38.84
-uhu-23-1               A       162.254.26.186
+;uhu-15-1              A       208.94.38.109
+;uhu-15-2              A       162.254.25.200
+;uhu-15-3              A       208.94.38.84
+;uhu-23-1              A       162.254.26.186
 uhu27-jessie           A       185.48.116.254
-webmail                        CNAME   helga.brehm-online.com.
+webmail                        CNAME   mail.uhu-banane.net.
 www                    CNAME   uhu1
 www-test               CNAME   uhu1
 zuhause                        CNAME   home-uhu-banane.ddnss.de.

diff --git a/bind/zones/uhu-banane.net.zone b/bind/zones/uhu-banane.net.zone
index 23b1addb7b2094bdbfedbe38fad6b5ed0e6ea37c..6a8fc88275f900722ffd5092e782ea514b300b58 100644 (file)
--- a/bind/zones/uhu-banane.net.zone
+++ b/bind/zones/uhu-banane.net.zone
@@ -2,7 +2,7 @@ $ORIGIN .
 ;$TTL 86400    ; 1 day
 $TTL 900
 uhu-banane.net IN SOA  ns3.uhu-banane.de. hostmaster.uhu-banane.de. (
-                               2016072400 ; serial
+                               2016072800 ; serial
                                10800      ; refresh (3 hours)
                                3600       ; retry (1 hour)
                                604800     ; expire (1 week)
@@ -26,9 +26,12 @@ dkim._domainkey      3600    TXT (
   "Xb0g+M90EyYkEi4p4JXLrthZlzOLO4wC+urMJRnSUkc2FrKbx4Ii6lHkeDyjdWA0"
   "0BDeL4iC8qHT+w8lDBRXWZTy3Ef3/iSFC3JfE19Ef9QTuqua/2V9Nhwe0f+JP1ld"
   "SHGp123fDfwE75USMwIDAQAB")
+imap                   CNAME   mail
 ldap                   CNAME   ns3.uhu-banane.de.
 ldapadmin              CNAME   ns3.uhu-banane.de.
 mail                   A       185.48.118.130
+mx                     CNAME   mail
 git                    CNAME   ns3.uhu-banane.de.
 www                    CNAME   www.uhu-banane.de.
 sarah                  CNAME   sarah.uhu-banane.de.
+smtp                   CNAME   mail