projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
686940b
)
remove old entries
author
Martin Zobel-Helas
<zobel@debian.org>
Sat, 12 Nov 2011 16:27:36 +0000
(17:27 +0100)
committer
Martin Zobel-Helas
<zobel@debian.org>
Sat, 12 Nov 2011 16:27:36 +0000
(17:27 +0100)
manifests/site.pp
patch
|
blob
|
history
modules/exim/templates/eximconf.erb
patch
|
blob
|
history
modules/ferm/manifests/per-host.pp
patch
|
blob
|
history
modules/named/files/common/named.conf.debian-zones
patch
|
blob
|
history
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
0cd1940
..
6755e0c
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-112,7
+112,7
@@
node default {
}
case $hostname {
}
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 }
}
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
2a557ad
..
774e389
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
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
*@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
40ff44d
..
c9fc813
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 {
}
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
}
}
include ferm::ftp
}
}
diff --git
a/modules/named/files/common/named.conf.debian-zones
b/modules/named/files/common/named.conf.debian-zones
index
87cc9d4
..
32ce19f
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
};
// 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" {
// 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" {