projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop believing the client timestamp on log servers
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
41d88df
..
66236f4
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-37,7
+37,7
@@
node default {
include unbound
include bacula::client
include unbound
include bacula::client
- if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
+ if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi
,czerny
] {
include ganeti2
}
include ganeti2
}
@@
-82,7
+82,7
@@
node default {
include apache2
}
include apache2
}
- if $::hostname in [ravel,senfl,orff,draghi,diamond] {
+ if $::hostname in [ravel,senfl,orff,draghi,diamond
,rietz
] {
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
include named::geodns
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
include named::geodns
@@
-96,6
+96,10
@@
node default {
include nfs-server
}
include nfs-server
}
+ if $::hostname == 'vieuxtemps' {
+ include varnish
+ }
+
if $::brokenhosts {
include hosts
}
if $::brokenhosts {
include hosts
}
@@
-118,7
+122,9
@@
node default {
munin::check { 'spamassassin': }
}
munin::check { 'spamassassin': }
}
- if $::hoster in [ynic] {
- include lldp
+ if $::hoster {
+ if $::hoster in [ynic] {
+ include lldp
+ }
}
}
}
}