summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-27 22:43:23 +0100
committervarac <varacanero@zeromail.org>2014-02-27 22:43:23 +0100
commit0cd0076f945c0e02bfdc50ff483ceebceec131e2 (patch)
tree21c631e5bdee5e3019c7fbe4dfac1b04ef325599 /puppet/modules/site_webapp/manifests
parente8cd9ab2d4480aa7c16d15f5db664fa650d4c655 (diff)
parent66cc1345c3af4e814d98c8e4b90d90158ac9d399 (diff)
Merge branch 'one_monitornode_rules_them_all' into 0.6
Diffstat (limited to 'puppet/modules/site_webapp/manifests')
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index f8216aa4..d02a7261 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -157,5 +157,5 @@ class site_webapp {
}
include site_shorewall::webapp
-
+ include site_check_mk::agent::webapp
}