projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move to the new motd generation setup
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
d8d7490
..
c8d8cd5
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-19,10
+19,9
@@
node default {
include debian-org
include monit
include samhain
include debian-org
include monit
include samhain
+ include motd
- $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
- notice($nodeinfo.class)
- 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,11
+37,9
@@
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
}
}
}
}