diff options
author | Thomas Backlund <tmb@mageia.org> | 2012-11-02 22:39:00 +0000 |
---|---|---|
committer | Thomas Backlund <tmb@mageia.org> | 2012-11-02 22:39:00 +0000 |
commit | 1e861a1cd6749f0118660472e937d964dbfcdb6c (patch) | |
tree | 82276c936297e471f8b677ec4ae57dabd8c38da5 | |
parent | b2fb90fac195bf8b0bc035edfe3f60a2b5d12bcc (diff) | |
download | puppet-1e861a1cd6749f0118660472e937d964dbfcdb6c.tar puppet-1e861a1cd6749f0118660472e937d964dbfcdb6c.tar.gz puppet-1e861a1cd6749f0118660472e937d964dbfcdb6c.tar.bz2 puppet-1e861a1cd6749f0118660472e937d964dbfcdb6c.tar.xz puppet-1e861a1cd6749f0118660472e937d964dbfcdb6c.zip |
drop old-rabbit references
-rw-r--r-- | deployment/dns/templates/2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa.zone | 4 | ||||
-rw-r--r-- | deployment/dns/templates/mageia.org.zone | 5 | ||||
-rw-r--r-- | deployment/main_mirror/templates/rsyncd.conf | 3 |
3 files changed, 2 insertions, 10 deletions
diff --git a/deployment/dns/templates/2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa.zone b/deployment/dns/templates/2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa.zone index 450bb20b..166408b4 100644 --- a/deployment/dns/templates/2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa.zone +++ b/deployment/dns/templates/2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa.zone @@ -1,6 +1,6 @@ $TTL 3D @ IN SOA ns0.mageia.org. root.mageia.org. ( - 2012082900 ; Serial + 2012110200 ; Serial 3600 ; Refresh 3600 ; Retry 2419200 ; Expire @@ -10,5 +10,3 @@ $TTL 3D ; nameservers @ IN NS ns0.mageia.org. @ IN NS ns1.mageia.org. - -f.7.0.4.1.8.e.f.f.f.9.b.6.2.2.0 IN PTR old-rabbit.mageia.org. diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index 2631a7ff..69b43b75 100644 --- a/deployment/dns/templates/mageia.org.zone +++ b/deployment/dns/templates/mageia.org.zone @@ -3,7 +3,7 @@ ; $Id$ $TTL 1h @ IN SOA ns0.mageia.org. root.mageia.org. ( - 2012092900 ; Serial + 2012110200 ; Serial 21600 ; Refresh 3600 ; Retry 2419200 ; Expire @@ -68,9 +68,6 @@ sucuk IN AAAA 2a02:2178:2:7::7 rabbit IN A 212.85.158.152 rabbit IN AAAA 2a02:2178:2:7::8 -old-rabbit IN A 88.190.12.224 -old-rabbit IN AAAA 2a01:e0b:1000:12:226:b9ff:fe81:407f - arm1 IN A 10.42.0.51 arm2 IN A 10.42.0.52 diff --git a/deployment/main_mirror/templates/rsyncd.conf b/deployment/main_mirror/templates/rsyncd.conf index 4eb26517..a8d38b82 100644 --- a/deployment/main_mirror/templates/rsyncd.conf +++ b/deployment/main_mirror/templates/rsyncd.conf @@ -8,7 +8,6 @@ gid = nogroup comment = Mageia Mirror Tree hosts allow = \ 10.42.0.0/24 \ - old-rabbit.<%= domain %> \ rabbit.<%= domain %> \ alamut.<%= domain %> \ arm1.<%= domain %> \ @@ -41,14 +40,12 @@ gid = nogroup path = /distrib/newrelease/ comment = Mageia Next Release hosts allow = \ - old-rabbit.<%= domain %> \ rabbit.<%= domain %> \ [bootstrap] path = /distrib/bootstrap/ comment = Mageia Bootstrap hosts allow = \ - old-rabbit.<%= domain %> \ rabbit.<%= domain %> \ distrib-coffee.ipsl.jussieu.fr \ distribipsl.aero.jussieu.fr \ |