Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

diff --git a/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific
new file mode 100644 (file)
index 0000000..19e0ccf
--- /dev/null
+++ b/modules/nagios/files/per-host/geo1.debian.org/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+geoip-database
+libgeoip1
+geoip-bin

diff --git a/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific
new file mode 100644 (file)
index 0000000..19e0ccf
--- /dev/null
+++ b/modules/nagios/files/per-host/geo2.debian.org/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+geoip-database
+libgeoip1
+geoip-bin

diff --git a/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific
new file mode 100644 (file)
index 0000000..19e0ccf
--- /dev/null
+++ b/modules/nagios/files/per-host/geo3.debian.org/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,8 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+geoip-database
+libgeoip1
+geoip-bin

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index ad520c3..1864a1c 100644 (file)
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -6,6 +6,14 @@
 view "AF" {
   match-clients { AF; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.AF";
@@ -50,6 +58,14 @@ view "AF" {
 view "AN" {
   match-clients { AN; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.AN";
@@ -94,6 +110,14 @@ view "AN" {
 view "AS" {
   match-clients { AS; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.AS";
@@ -138,6 +162,14 @@ view "AS" {
 view "EU" {
   match-clients { EU; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.EU";
@@ -182,6 +214,14 @@ view "EU" {
 view "NA" {
   match-clients { NA; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.NA";
@@ -226,6 +266,14 @@ view "NA" {
 view "OC" {
   match-clients { OC; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.OC";
@@ -270,6 +318,14 @@ view "OC" {
 view "SA" {
   match-clients { SA; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.SA";
@@ -314,6 +370,14 @@ view "SA" {
 view "default" {
   match-clients { any; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org";

diff --git a/modules/named/files/common/named.conf.options b/modules/named/files/common/named.conf.options
index 1a87200..b81be8c 100644 (file)
--- a/modules/named/files/common/named.conf.options
+++ b/modules/named/files/common/named.conf.options
@@ -25,6 +25,7 @@ options {
         allow-update { none; };
         allow-transfer { none; };
         allow-recursion { Nagios; };
+        blackhole { 192.168.0.0/16; 10.0.0.0/8; 172.16.0.0/12; };
 };
 
 logging {

diff --git a/modules/named/files/common/recvconf.files b/modules/named/files/common/recvconf.files
index 9c6667b..c44205b 100644 (file)
--- a/modules/named/files/common/recvconf.files
+++ b/modules/named/files/common/recvconf.files
@@ -147,6 +147,54 @@ file etc/bind/geodns/db.security.debian.org.NA
     group geodnssync
     precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.NA
     postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.volatile.debian.org.AN
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail volatile.debian.org etc/bind/geodns/db.volatile.debian.org.AN
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.volatile.debian.org.SA
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail volatile.debian.org etc/bind/geodns/db.volatile.debian.org.SA
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.volatile.debian.org.OC
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail volatile.debian.org etc/bind/geodns/db.volatile.debian.org.OC
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.volatile.debian.org.AS
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail volatile.debian.org etc/bind/geodns/db.volatile.debian.org.AS
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.volatile.debian.org.AF
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail volatile.debian.org etc/bind/geodns/db.volatile.debian.org.AF
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.volatile.debian.org
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail volatile.debian.org etc/bind/geodns/db.volatile.debian.org
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.volatile.debian.org.EU
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail volatile.debian.org etc/bind/geodns/db.volatile.debian.org.EU
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.volatile.debian.org.NA
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail volatile.debian.org etc/bind/geodns/db.volatile.debian.org.NA
+    postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.www.debian.org.AN
     perms 0644
     user geodnssync