diff options
| author | varac <varacanero@zeromail.org> | 2014-02-25 12:48:24 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-25 12:48:24 +0100 |
| commit | 70d65dd47f8d696764a8e33bd0cd77a3f5ead1e1 (patch) | |
| tree | a81b32e2800bd2e4ba7b5e2134e8e1ecd95f158e | |
| parent | 0e52976bf9e1cb907a2730a78dded0ef8fb2410a (diff) | |
| parent | 867fce7a855ceef8891b5f9bea1f71c6663cd403 (diff) | |
Merge branch '5149_mx_server_has_soledad_check_mk' into 0.6
| -rw-r--r-- | puppet/modules/soledad/manifests/init.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/puppet/modules/soledad/manifests/init.pp b/puppet/modules/soledad/manifests/init.pp index 35adc28e..7cf0b729 100644 --- a/puppet/modules/soledad/manifests/init.pp +++ b/puppet/modules/soledad/manifests/init.pp @@ -26,7 +26,4 @@ class soledad { group => 'soledad', require => User['soledad']; } - - include site_check_mk::agent::soledad - } diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp index 572cad44..1137080f 100644 --- a/puppet/modules/soledad/manifests/server.pp +++ b/puppet/modules/soledad/manifests/server.pp @@ -59,4 +59,5 @@ class soledad::server { } include site_shorewall::soledad + include site_check_mk::agent::soledad } |