projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
992e6a9
..
99af3fc
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-12,6
+12,7
@@
File {
node default {
include munin-node
include samhain
node default {
include munin-node
include samhain
+ include sudo
include debian-org
case $smartarraycontroller {
include debian-org
case $smartarraycontroller {
@@
-43,11
+44,22
@@
node default {
default: {}
}
default: {}
}
- # test here first
case $hostname {
case $hostname {
- handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo: { include sudo }
+ brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+ { include buildd }
default: {}
}
default: {}
}
+ case $hostname {
+ geo1,geo2,geo3:
+ { include geodns }
+ default: {}
+ }
+ case $hostname {
+ argento:
+ { include monit }
+ default: {}
+ }
+
}
node penalosa inherits default {
}
node penalosa inherits default {