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
f264230
..
2e636b5
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-18,7
+18,9
@@
node default {
include sudo
include debian-org
include monit
include sudo
include debian-org
include monit
- include motd
+ 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 }
@@
-30,20
+32,16
@@
node default {
default: {}
}
default: {}
}
- import "nagios"
- include nagios-client
case $hostname {
case $hostname {
- morales: {}
- default: { include samhain }
- }
-
- case $hostname {
- spohr: {
- import "nagios"
- include nagios-server
- }
- default: {}
+ spohr: {
+ include nagios::server
+ include motd::new
+ }
+ default: {
+ include nagios::client
+ include motd
+ }
}
case $apache2 {
}
case $apache2 {