projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put the yaml in the tree and call the right file
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
3c5923f
..
2e636b5
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-9,10
+9,18
@@
File {
ensure => file,
}
ensure => file,
}
+Exec {
+ path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
node default {
include munin-node
node default {
include munin-node
- include s
amhain
+ include s
udo
include debian-org
include debian-org
+ include monit
+ include samhain
+
+ $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
@@
-24,24
+32,36
@@
node default {
default: {}
}
default: {}
}
- import "nagios"
- include nagios-client
case $hostname {
case $hostname {
- spohr: {
- import "nagios"
- include nagios-server
- }
- default: {}
+ spohr: {
+ include nagios::server
+ include motd::new
+ }
+ default: {
+ include nagios::client
+ include motd
+ }
}
case $apache2 {
"true": { case $hostname {
}
case $apache2 {
"true": { case $hostname {
- carver
: { import "apache2"
}
+ carver
,rore,tartini: { include apache2
}
default: {}
} }
default: {}
}
default: {}
} }
default: {}
}
+
+ case $hostname {
+ ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+ { include buildd }
+ default: {}
+ }
+ case $hostname {
+ geo1,geo2,geo3:
+ { include geodns }
+ default: {}
+ }
}
node penalosa inherits default {
}
node penalosa inherits default {