aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-07-31 17:32:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-07-31 17:32:34 -0300
commitf2df062d214aca272594781a04b4eb6981c355bf (patch)
treeb26037d9ca94dff14a0917d3ec2795adbe479bd9
parent8a4fbfa8a071094e5727f4e49107c0cfe79e9c45 (diff)
downloadpuppet-nodo-f2df062d214aca272594781a04b4eb6981c355bf.tar.gz
puppet-nodo-f2df062d214aca272594781a04b4eb6981c355bf.tar.bz2
Add .conf to munin apache2 config
-rw-r--r--manifests/subsystem/monitor/master.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/subsystem/monitor/master.pp b/manifests/subsystem/monitor/master.pp
index 1f97a36..dd6defa 100644
--- a/manifests/subsystem/monitor/master.pp
+++ b/manifests/subsystem/monitor/master.pp
@@ -13,8 +13,13 @@ class nodo::subsystem::monitor::master {
default => 'absent',
}
- # Munin configuration for apache
+ # Legacy configuration
file { '/etc/apache2/conf.d/munin':
+ ensure => absent,
+ }
+
+ # Munin configuration for apache
+ file { '/etc/apache2/conf.d/munin.conf':
ensure => present,
owner => root,
group => root,