Removing all TS, Acwain and Planetec zones from bind/common.sls

diff --git a/bind/common.sls b/bind/common.sls
index 19ab8d534099fa3def9cb78248a49fa472cfe434..0757185be4914de4fc9abe5de8353d3e08872a4e 100644 (file)
--- a/bind/common.sls
+++ b/bind/common.sls
@@ -7,18 +7,9 @@ bind:
       - 46.189.56.7
       # ns3.boreus.de
       - 85.199.64.7
       - 46.189.56.7
       # ns3.boreus.de
       - 85.199.64.7

-      # uhu1.uhu-banane.de
-      - 46.16.73.175
-      - 2001:4dd0:ff00:cd3::2

       # helga.brehm-online.com
       - 188.34.187.246
       - 2a01:4f8:c010:80ee::1
       # helga.brehm-online.com
       - 188.34.187.246
       - 2a01:4f8:c010:80ee::1

-      # maria.acwain.net
-      - 144.76.221.169
-      - 2a01:4f8:200:94a8::2
-      # the.nexunus.net
-      - 138.201.28.135
-      - 2a01:4f8:171:3006::2

       # ns1.uhu-banane.de
       - 185.48.118.128
       # ns2.uhu-banane.de
       # ns1.uhu-banane.de
       - 185.48.118.128
       # ns2.uhu-banane.de


@@ -32,18 +23,9 @@ bind:
       - 127.0.0.1
       - ::1
     allow-dyn-update:
       - 127.0.0.1
       - ::1
     allow-dyn-update:

-      # uhu1.uhu-banane.de
-      - 46.16.73.175
-      - 2001:4dd0:ff00:cd3::2

       # helga.brehm-online.com
       - 188.34.187.246
       - 2a01:4f8:c010:80ee::1
       # helga.brehm-online.com
       - 188.34.187.246
       - 2a01:4f8:c010:80ee::1

-      # maria.acwain.net
-      - 144.76.221.169
-      - 2a01:4f8:200:94a8::2
-      # the.nexunus.net
-      - 138.201.28.135
-      - 2a01:4f8:171:3006::2

       # ns1.uhu-banane.de
       - 185.48.118.128
       # ns2.uhu-banane.de
       # ns1.uhu-banane.de
       - 185.48.118.128
       # ns2.uhu-banane.de


@@ -57,18 +39,9 @@ bind:
       - 127.0.0.1
       - ::1
     allow-notify:
       - 127.0.0.1
       - ::1
     allow-notify:

-      # uhu1.uhu-banane.de
-      - 46.16.73.175
-      - 2001:4dd0:ff00:cd3::2

       # helga.brehm-online.com
       - 188.34.187.246
       - 2a01:4f8:c010:80ee::1
       # helga.brehm-online.com
       - 188.34.187.246
       - 2a01:4f8:c010:80ee::1

-      # maria.acwain.net
-      - 144.76.221.169
-      - 2a01:4f8:200:94a8::2
-      # the.nexunus.net
-      - 138.201.28.135
-      - 2a01:4f8:171:3006::2

       # ns1.uhu-banane.de
       - 185.48.118.128
       # ns2.uhu-banane.de
       # ns1.uhu-banane.de
       - 185.48.118.128
       # ns2.uhu-banane.de


@@ -82,15 +55,9 @@ bind:
       - 127.0.0.1
       - ::1
     allow-recursion:
       - 127.0.0.1
       - ::1
     allow-recursion:

-      # uhu1.uhu-banane.de
-      - 46.16.73.175
-      - 2001:4dd0:ff00:cd3::2

       # helga.brehm-online.com
       - 188.34.187.246
       - 2a01:4f8:c010:80ee::1
       # helga.brehm-online.com
       - 188.34.187.246
       - 2a01:4f8:c010:80ee::1

-      # maria.acwain.net
-      - 144.76.221.169
-      - 2a01:4f8:200:94a8::2

       # ns1.uhu-banane.de
       - 185.48.118.128
       # ns2.uhu-banane.de
       # ns1.uhu-banane.de
       - 185.48.118.128
       # ns2.uhu-banane.de


@@ -100,29 +67,13 @@ bind:
       - 2a06:2380:0:1::3a
       # bruni.home.brehm-online.com
       - 2a02:8109:ae3f:fa04:5604:a6ff:fe38:99f9
       - 2a06:2380:0:1::3a
       # bruni.home.brehm-online.com
       - 2a02:8109:ae3f:fa04:5604:a6ff:fe38:99f9

-      # nexunus.net Geraffe
-      - 138.201.28.135
-      - 138.201.28.184
-      - 138.201.28.185
-      - 138.201.28.186
-      - 2a01:4f8:171:3006::/64
-{%- if salt['grains.get']('id') in ('ns1.uhu-banane.de', ) %}
-      # local network in ProfitBricks network
-      - 10.12.20.0/24
-{%- endif %}

       # local addresses
       - 127.0.0.0/8
       - ::1/128
       - fe80::/10
     also-notify-acwain:
       # local addresses
       - 127.0.0.0/8
       - ::1/128
       - fe80::/10
     also-notify-acwain:

-      # maria.acwain.net
-      - 144.76.221.169
-      - 2a01:4f8:200:94a8::2

       # bruni.home.brehm-online.com
       - 2a02:8109:ae3f:fa04:5604:a6ff:fe38:99f9
       # bruni.home.brehm-online.com
       - 2a02:8109:ae3f:fa04:5604:a6ff:fe38:99f9

-      # the.nexunus.net
-      - 138.201.28.135
-      - 2a01:4f8:171:3006::2

     also-notify-boreus:
       # ns1.boreus.de
       - 195.50.185.7
     also-notify-boreus:
       # ns1.boreus.de
       - 195.50.185.7


@@ -146,10 +97,8 @@ bind:
       - ::1/128
       - fe80::/10
     private-net-ips:
       - ::1/128
       - fe80::/10
     private-net-ips:

+      # Zuhause

       - 10.12.11.0/24
       - 10.12.11.0/24

-      # uhu1.uhu-banane.de
-      - 46.16.73.175
-      - 2001:4dd0:ff00:cd3::2

       # bruni.home.brehm-online.com
       - 2a02:8109:ae3f:fa04:5604:a6ff:fe38:99f9
       # helga.brehm-online.com
       # bruni.home.brehm-online.com
       - 2a02:8109:ae3f:fa04:5604:a6ff:fe38:99f9
       # helga.brehm-online.com


@@ -159,364 +108,6 @@ bind:
       - 185.102.95.107
       - 2a06:2380:0:1::3a
   my-zones:
       - 185.102.95.107
       - 2a06:2380:0:1::3a
   my-zones:

-    ########################################
-    # Thomas Schmidt
-    #-------------------
-    nexunus.com:
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-    #-------------------
-    nexunus.de:
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-    #-------------------
-    nexunus.net:
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-    #-------------------
-    pontilus.com:
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-    #-------------------
-    pontilus.de:
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-
-    #-------------------
-    0.31.172.in-addr.arpa:
-      filename: rev.172.31.0.zone
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-
-    #-------------------
-    0.32.172.in-addr.arpa:
-      filename: rev.172.32.0.zone
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-
-    #-------------------
-    0.0.0.1.6.0.0.3.1.7.1.0.8.f.4.0.1.0.a.2.ip6.arpa:
-      filename: rev.2a01-4f8-171-3006-1000.zone
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-
-    #-------------------
-    0.0.0.2.6.0.0.3.1.7.1.0.8.f.4.0.1.0.a.2.ip6.arpa:
-      filename: rev.2a01-4f8-171-3006-2000.zone
-      master:
-        liz.nexunus.net: 138.201.28.135
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-
-    ########################################
-    # Acwain zones
-    acwain.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    acwain.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    acwain.net:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    acwain.org:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    dkn-die-zahnaerzte.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    domaniecki.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    dyn.acwain.net:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    e-nergieplus.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    ereda.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    gl-versicherungsmakler.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    haemato-onkologie-hamburg.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    haemato-onkologie-hh.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    hausarztpraxis-hoheluft.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    ihrezahnaerzte.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    irtk.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    kleinanzeigen-mv.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    krebszentrum-hoheluft.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    krebszentrum-laack.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    krebszentrum-suederelbe.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    mexico-language-school.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    mexico-travel-and-tours.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    mexventure.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    mexventures.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    mexventure.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    mexventures.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    mypettown.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    mypettown.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    onkologie-hoheluft.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    onkologie-laack.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    onkologie-suederelbe.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    planetec.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns1.uhu-banane.de: 185.48.118.128
-        ns2.uhu-banane.de: 162.254.24.33
-        ns3.uhu-banane.de: 185.102.95.107
-    saeger.cc:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    saeger.net:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    sg-hohh.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    shopyoo.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    shop-yoo.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    shop-yoo.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    shopyoo.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    shopyou.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    shop-you.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    shopyou.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    spanish-school-mexico.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    sprachreisen-mexiko.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    sprachschule-mexiko.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    spridgets.net:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    spridget-register.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    timo-adam.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    timoadam.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    vital-beauty.net:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    vitalbeauty.net:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    xn--hmato-onkologie-hamburg-v7b.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    xn--hmato-onkologie-hh-ltb.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    zahnpiraten.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-    zahnpiraten-hamburg.com:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
-

     ##########################
     # Own zones
     brehm-berlin.de:
     ##########################
     # Own zones
     brehm-berlin.de: