summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-10 18:57:26 +0100
committervarac <varacanero@zeromail.org>2014-02-10 18:57:26 +0100
commit881d2c38aeb03ebe34c4b41b747bdadfbd65e678 (patch)
treeddf1b783e515b8df8b0cd7500825a471ff5200e6 /puppet/modules
parentdf342b1d4a12ea14aaaede6d876cca16028ba9a2 (diff)
parent6255e58bf9ff3489bf2707bc2be9759ec5c7db68 (diff)
Merge branch '0.6' into 4982_check_mk
Conflicts: provider_base/services/monitor.json puppet/modules/site_nagios/manifests/server.pp
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp6
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index 59a3bbb0..d740d8b7 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -19,12 +19,6 @@ class site_nagios::server inherits nagios::base {
stored_config => false,
}
- # - [monitor2] err: /Stage[main]/Site_nagios::Server/Apache::Config::Global[nagios3.conf]/Apache::Config::File[nagios3.conf]/File[apache_nagios3.conf]/ensure: change from absent to link failed: Cannot create a symlink without a target at /srv/leap/puppet/modules/apache/manifests/config/file.pp:32
- #apache::config::global { 'nagios3.conf':
- # ensure => link,
- # target => '/usr/share/doc/nagios3-common/examples/apache2.conf',
- #}
-
file { '/etc/apache2/conf.d/nagios3.conf':
ensure => link,
target => '/usr/share/doc/nagios3-common/examples/apache2.conf',