From 47956d833f29daab3137c1e71cbf0926bd7db5f4 Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Sat, 12 Nov 2011 17:27:36 +0100 Subject: [PATCH] remove old entries --- manifests/site.pp | 2 +- modules/exim/templates/eximconf.erb | 1 - modules/ferm/manifests/per-host.pp | 2 +- .../files/common/named.conf.debian-zones | 26 +++++++++---------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 0cd19404..6755e0c8 100644 --- 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 2a557adf..774e3895 100644 --- 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 40ff44df..c9fc8137 100644 --- 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 87cc9d4d..32ce19fb 100644 --- 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" { -- 2.39.2