Merge branch 'master' into staging

diff --git a/manifests/site.pp b/manifests/site.pp
index abceb1fb71cbe45a37aae327a1111eaa286f870e..54711fe03f9453913eb55ead12cf8fcd892fbc1d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -81,6 +81,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins":  { include resolv }
     }
 }

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 1d40853b1b05426573b0279eba4e12825e992adb..6193cb46ec9f9e55bddeefd3dd32d0c0d10e19de 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -144,6 +144,12 @@ class exim {
           group   => Debian-exim,
           mode    => 640
           ;
+        "/var/log/exim4":
+          mode    => 2750,
+          ensure  => directory
+          owner   => Debian-exim,
+          group   => maillog
+          ;
     }
 
     exec { "exim4 reload":

diff --git a/modules/named/files/common/named.conf.acl b/modules/named/files/common/named.conf.acl
index 42a63495ae89c58e73c8e98d66994d312eae6bb1..8ca867a800e53fb4e411f1b6d0d64d4a0ce4b42f 100644 (file)
--- a/modules/named/files/common/named.conf.acl
+++ b/modules/named/files/common/named.conf.acl
@@ -282,3 +282,8 @@ acl AN {
        country_HM;
        country_TF;
 };
+
+acl undef {
+       country_A1;
+       country_A2;
+};

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 41549426bbb0c05066895030559e98ad33469e0b..57fe21996a5d1394e79937ae401caf57107dd42f 100644 (file)
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -422,6 +422,66 @@ view "SA" {
     allow-transfer { };
   };
 
+};
+view "undef" {
+  match-clients { undef; };
+
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.security.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.security.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.www.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "packages.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.packages.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
 };
 view "default" {
   match-clients { any; };

diff --git a/modules/named/files/common/recvconf.files b/modules/named/files/common/recvconf.files
index d6ce82e4b78871f12fccf54731784d2ac0932223..e91238323bb1bff3f5a857f5b9af73fcc183f03b 100644 (file)
--- a/modules/named/files/common/recvconf.files
+++ b/modules/named/files/common/recvconf.files
@@ -27,6 +27,12 @@ file etc/bind/geodns/db.bugs.debian.org.AS
     group geodnssync
     precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail bugs.debian.org etc/bind/geodns/db.bugs.debian.org.AS
     postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.bugs.debian.org.undef
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail bugs.debian.org etc/bind/geodns/db.bugs.debian.org.undef
+    postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.bugs.debian.org.AF
     perms 0644
     user geodnssync
@@ -51,6 +57,60 @@ file etc/bind/geodns/db.bugs.debian.org.NA
     group geodnssync
     precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail bugs.debian.org etc/bind/geodns/db.bugs.debian.org.NA
     postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.AN
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.SA
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.OC
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.AS
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.debian.org.undef
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail ftp.debian.org etc/bind/geodns/db.ftp.debian.org.undef
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.AF
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.EU
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.NA
+    postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.packages.debian.org.AN
     perms 0644
     user geodnssync
@@ -75,6 +135,12 @@ file etc/bind/geodns/db.packages.debian.org.AS
     group geodnssync
     precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail packages.debian.org etc/bind/geodns/db.packages.debian.org.AS
     postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.packages.debian.org.undef
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail packages.debian.org etc/bind/geodns/db.packages.debian.org.undef
+    postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.packages.debian.org.AF
     perms 0644
     user geodnssync
@@ -123,6 +189,12 @@ file etc/bind/geodns/db.security.debian.org.AS
     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.AS
     postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.security.debian.org.undef
+    perms 0644
+    user geodnssync
+    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.undef
+    postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.security.debian.org.AF
     perms 0644
     user geodnssync
@@ -171,6 +243,12 @@ file etc/bind/geodns/db.volatile.debian.org.AS
     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.undef
+    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.undef
+    postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.volatile.debian.org.AF
     perms 0644
     user geodnssync
@@ -219,6 +297,12 @@ file etc/bind/geodns/db.www.debian.org.AS
     group geodnssync
     precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.AS
     postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.www.debian.org.undef
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.undef
+    postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.www.debian.org.AF
     perms 0644
     user geodnssync
@@ -243,51 +327,3 @@ file etc/bind/geodns/db.www.debian.org.NA
     group geodnssync
     precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.NA
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.AN
-    postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.SA
-    postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.OC
-    postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.AS
-    postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.AF
-    postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org
-    postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.EU
-    postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.ftp.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 ftp.debian.org etc/bind/geodns/db.ftp.debian.org.NA
-    postcommand sudo /etc/init.d/bind9 reload

diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 8fa658de5fa57e6b3c410f5ae601b8e4257662dd..fa648821a4fa0db29006bb4506f37cb3aaa52ae0 100644 (file)
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -17,8 +17,15 @@ case hoster
       when "draghi", "liszt" then
         nameservers << "127.0.0.1"
     end
-    nameservers += ["82.195.75.81", "82.195.66.249", "217.198.242.225"]
+    nameservers += ["82.195.66.249", "217.198.242.225"]
     searchpaths << "debprivate-darmstadt.debian.org"
+  when "ftcollins" then
+    case hostname
+      when "spohr", "samosa" then
+        nameservers << "127.0.0.1"
+    end
+    nameservers += ["192.25.206.33", "192.25.206.59"]
+    searchpaths << "debprivate-ftcollins.debian.org"
 end
 
 searchpaths << "debian.org"