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
e8f5dfc
..
2e636b5
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-18,11
+18,9
@@
node default {
include sudo
include debian-org
include monit
include sudo
include debian-org
include monit
- include motd
include samhain
include samhain
- $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
- notice($nodeinfo)
+ $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
@@
-38,9
+36,11
@@
node default {
case $hostname {
spohr: {
include nagios::server
case $hostname {
spohr: {
include nagios::server
+ include motd::new
}
default: {
include nagios::client
}
default: {
include nagios::client
+ include motd
}
}
}
}