projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add default /etc/syslog-ng/syslog-ng.conf and /etc/logrotate.d/syslog-ng
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
7b76de9
..
cdecc63
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-18,12
+18,12
@@
node default {
include sudo
include debian-org
include monit
include sudo
include debian-org
include monit
- include samhain
include apt-keys
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
include motd
include apt-keys
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
include motd
+ include samhain
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
@@
-58,6
+58,14
@@
node default {
{ include buildd }
default: {}
}
{ include buildd }
default: {}
}
+
+# maybe wait for rietz to be upgraded to lenny
+# case $hostname {
+# rietz,raff,klecker:
+# { include named-secondary }
+# default: {}
+# }
+
case $hostname {
geo1,geo2,geo3:
{ include geodns }
case $hostname {
geo1,geo2,geo3:
{ include geodns }