projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of volatile zone
[mirror/dsa-puppet.git]
/
modules
/
named
/
files
/
common
/
named.conf.geo
diff --git
a/modules/named/files/common/named.conf.geo
b/modules/named/files/common/named.conf.geo
index
a5b2c61
..
2f73886
100644
(file)
--- a/
modules/named/files/common/named.conf.geo
+++ b/
modules/named/files/common/named.conf.geo
@@
-30,6
+30,14
@@
view "AF" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AF";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
@@
-62,14
+70,6
@@
view "AF" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AF";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
@@
-106,6
+106,14
@@
view "AN" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AN";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
@@
-138,14
+146,6
@@
view "AN" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AN";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
@@
-182,6
+182,14
@@
view "AS" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AS";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
@@
-214,14
+222,6
@@
view "AS" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AS";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
@@
-258,6
+258,14
@@
view "EU" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.EU";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
@@
-290,14
+298,6
@@
view "EU" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.EU";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
@@
-334,6
+334,14
@@
view "NA" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.NA";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
@@
-366,14
+374,6
@@
view "NA" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.NA";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
@@
-410,6
+410,14
@@
view "OC" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.OC";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
@@
-442,14
+450,6
@@
view "OC" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.OC";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
@@
-486,6
+486,14
@@
view "SA" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.SA";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
@@
-518,14
+526,6
@@
view "SA" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.SA";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
@@
-562,6
+562,14
@@
view "undef" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.undef";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
@@
-594,14
+602,6
@@
view "undef" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.undef";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
@@
-638,6
+638,14
@@
view "default" {
allow-transfer { };
};
allow-transfer { };
};
+ zone "ftp-upcoming.debian.org" {
+ type master;
+ file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org";
+ notify no;
+ allow-query { any; };
+ allow-transfer { };
+ };
+
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
zone "ftp.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
@@
-670,14
+678,6
@@
view "default" {
allow-transfer { };
};
allow-transfer { };
};
- zone "volatile.debian.org" {
- type master;
- file "/etc/bind/geodns/zonefiles/db.volatile.debian.org";
- notify no;
- allow-query { any; };
- allow-transfer { };
- };
-
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org";
zone "www.debian.org" {
type master;
file "/etc/bind/geodns/zonefiles/db.www.debian.org";