diff options
| author | varac <varacanero@zeromail.org> | 2014-02-17 12:57:05 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-17 12:57:05 +0100 |
| commit | bd7a0f98ce0819fcc06ad8dcf11600a78577750d (patch) | |
| tree | e96f974f962231dc1388260afb3435e5ce99a114 /puppet/modules/site_nagios/manifests/server.pp | |
| parent | 20de385ac787a8a66259bb6fb93a706cbc24d461 (diff) | |
| parent | d0eea33d88a6ffcbe01544678372d80e8c8de51f (diff) | |
Merge branch '4982_check_mk' into 0.6
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server.pp')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index b1e8a8cb..b1795826 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -45,5 +45,7 @@ class site_nagios::server inherits nagios::base { create_resources ( site_nagios::add_host, $hosts ) + include site_nagios::server::apache + include site_check_mk::server include site_shorewall::monitor } |