diff options
| -rw-r--r-- | files/config/host/munin.conf.header.Debian | 2 | ||||
| -rw-r--r-- | manifests/host/cgi.pp | 2 | ||||
| -rw-r--r-- | templates/site.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/files/config/host/munin.conf.header.Debian b/files/config/host/munin.conf.header.Debian index 082f01f..771d50d 100644 --- a/files/config/host/munin.conf.header.Debian +++ b/files/config/host/munin.conf.header.Debian @@ -4,7 +4,7 @@ # databases, the HTML output, and the logs, severally. They all # must be writable by the user running munin-cron. dbdir /var/lib/munin -htmldir /var/www/munin +htmldir /var/cache/munin/www logdir /var/log/munin rundir /var/run/munin diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp index cbf1052..ab09168 100644 --- a/manifests/host/cgi.pp +++ b/manifests/host/cgi.pp @@ -3,7 +3,7 @@ class munin::host::cgi inherits munin::host { case $operatingsystem { debian: { exec { 'set_modes_for_cgi': - command => 'chgrp www-data /var/log/munin /var/log/munin/munin-graph.log && chmod g+w /var/log/munin /var/log/munin/munin-graph.log && find /var/www/munin/* -maxdepth 1 -type d -exec chgrp -R www-data {} \; && find /var/www/munin/* -maxdepth 1 -type d -exec chmod -R g+w {} \;', + command => 'chgrp www-data /var/log/munin /var/log/munin/munin-graph.log && chmod g+w /var/log/munin /var/log/munin/munin-graph.log && find /var/cache/munin/www/* -maxdepth 1 -type d -exec chgrp -R www-data {} \; && find /var/www/munin/* -maxdepth 1 -type d -exec chmod -R g+w {} \;', refreshonly => true, subscribe => File['/etc/munin/munin.conf.header'], } diff --git a/templates/site.conf b/templates/site.conf index 549437c..52ddb53 100644 --- a/templates/site.conf +++ b/templates/site.conf @@ -1,6 +1,6 @@ <VirtualHost *> ServerName <%= name %> - DocumentRoot /var/www/munin/ + DocumentRoot /var/cache/munin/www/ <Location /> order allow,deny Allow from all |