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
86b8c71
..
094c418
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-9,11
+9,17
@@
File {
ensure => file,
}
ensure => file,
}
+Exec {
+ path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
node default {
include munin-node
include sudo
include debian-org
include monit
node default {
include munin-node
include sudo
include debian-org
include monit
+ include motd
+ include samhain
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
@@
-25,20
+31,14
@@
node default {
default: {}
}
default: {}
}
- import "nagios"
- include nagios-client
-
- case $hostname {
- morales: {}
- default: { include samhain }
- }
case $hostname {
case $hostname {
- spohr: {
- import "nagios"
- include nagios-server
- }
- default: {}
+ spohr: {
+ include nagios::server
+ }
+ default: {
+ include nagios::client
+ }
}
case $apache2 {
}
case $apache2 {