remove old entries

diff --git a/manifests/site.pp b/manifests/site.pp
index 0cd194048fbdbd1a98634f892d877791e4a72957..6755e0c8366b4b8005893731183f805139fffff6 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -112,7 +112,7 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative }
+        ravel,senfl,orff,draghi,diamond: { include named::authoritative }
         geo1,geo2,geo3:                          { include named::geodns }
         liszt:                                   { include named::recursor }
     }

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 2a557adf6168c4a2f698c6e0e5534ee9a24a7388..774e38950b2c562e3984e20a61155cfe9f6e0c36 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -998,7 +998,6 @@ check_message:
 begin rewrite
 
 \N^buildd_(.*)@franck\.debian\.org$\N buildd_$1@buildd.debian.org T
-\N^buildd_(.*)@klecker\.debian\.org$\N buildd_$1@buildd.debian.org T
 *@debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T
 *@people.debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T
 #*@${primary_hostname} "${if exists{/etc/exim4/email-addresses}{${lookup{$1}lsearch{/etc/exim4/email-addresses}{$value}fail}}fail}" fFs

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 40ff44df383e194e7b31731f0be0347301f158e3..c9fc81371668755286ab4eb2a5ee41540cc4740a 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -6,7 +6,7 @@ class ferm::per-host {
     }
 
     case $hostname {
-        chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile: {
+        chopin,franck,gluck,kassia,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile: {
             include ferm::ftp
         }
     }

diff --git a/modules/named/files/common/named.conf.debian-zones b/modules/named/files/common/named.conf.debian-zones
index 87cc9d4d265cb9b74b68a5e16331cf0867ff39df..32ce19fb58c169429f3946803b4f2f84d80d88f5 100644 (file)
--- a/modules/named/files/common/named.conf.debian-zones
+++ b/modules/named/files/common/named.conf.debian-zones
@@ -176,19 +176,19 @@ zone "2.6.a.0.4.6.5.6.0.0.4.0.0.8.5.0.8.d.8.0.1.0.0.2.ip6.arpa" {
 };
 
 // ipv6 at xs4all - klecker 2001:888:2000:12::/64
-zone "2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa" {
-       type slave;
-       notify no;
-       file "db.2001:888:2000:12";
-       masters {
-               194.177.211.209; // orff
-               2001:648:2ffc:deb:213:72ff:fe69:e188; // orff
-               82.195.75.106; // draghi (backup master - requires manual reconfiguration on draghi)
-               2001:41b8:202:deb:216:36ff:fe40:3906; // draghi (see above
-       };
-       allow-query { any; };
-       allow-transfer { };
-};
+//zone "2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa" {
+//     type slave;
+//     notify no;
+//     file "db.2001:888:2000:12";
+//     masters {
+//             194.177.211.209; // orff
+//             2001:648:2ffc:deb:213:72ff:fe69:e188; // orff
+//             82.195.75.106; // draghi (backup master - requires manual reconfiguration on draghi)
+//             2001:41b8:202:deb:216:36ff:fe40:3906; // draghi (see above
+//     };
+//     allow-query { any; };
+//     allow-transfer { };
+//};
 
 // 19.12.206.in-addr.arpa zone - reverse zone for 206.12.19/24 - debian at UBC/ECE
 zone "19.12.206.in-addr.arpa" {