projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable nagios-master via puppet config push
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
ede7f9b
..
aaeacee
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-8,9
+8,9
@@
class roles {
include munin::master
}
include munin::master
}
- if getfromhash($site::nodeinfo, 'nagiosmaster') {
-
include nagios::server
- }
+
#
if getfromhash($site::nodeinfo, 'nagiosmaster') {
+
#
include nagios::server
+
#
}
if getfromhash($site::nodeinfo, 'buildd') {
include buildd
if getfromhash($site::nodeinfo, 'buildd') {
include buildd
@@
-73,5
+73,7
@@
class roles {
if getfromhash($site::nodeinfo, 'static_mirror') {
include roles::static_mirror
if getfromhash($site::nodeinfo, 'static_mirror') {
include roles::static_mirror
+ } elsif getfromhash($site::nodeinfo, 'static_source') {
+ include roles::static_source
}
}
}
}