diff options
| author | varac <varacanero@zeromail.org> | 2014-03-04 18:59:47 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-03-04 18:59:47 +0100 |
| commit | dfe2800b2264b4f2088d488d718ce72e39d2d15f (patch) | |
| tree | 4792721b97f95e45eb8a7041901a157b8fe473da /puppet/modules/site_nagios/manifests/server.pp | |
| parent | 468064d2346519eeda7638a185ff5fa6b53d5eb4 (diff) | |
| parent | 3b7c8e273a0e75e58c736b2eacf89b4c7b9d81e5 (diff) | |
Merge branch 'improve_monitoring_even_more' into 0.6
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server.pp')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index 9aae8ae8..7106c36a 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -1,9 +1,7 @@ class site_nagios::server inherits nagios::base { # First, purge old nagios config (see #1467) - class { 'site_nagios::server::purge': - stage => setup - } + class { 'site_nagios::server::purge': } $nagios_hiera = hiera('nagios') $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) |