projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more lenny
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
3aa5990
..
593be68
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-59,9
+59,7
@@
node default {
include postfix
}
include postfix
}
- if $::lsbdistcodename != 'lenny' {
- include unbound
- }
+ include unbound
if $::apache2 {
include apache2
if $::apache2 {
include apache2
@@
-75,8
+73,6
@@
node default {
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
include named::geodns
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
include named::geodns
- } elsif $::hostname == 'liszt' {
- include named::recursor
}
if $::hostname in [diabelli,nono,spohr] {
}
if $::hostname in [diabelli,nono,spohr] {
@@
-108,8
+104,4
@@
node default {
if $::spamd {
munin::check { 'spamassassin': }
}
if $::spamd {
munin::check { 'spamassassin': }
}
-
- if $::hostname in [chopin,franck,ravel] {
- include vsftpd
- }
}
}