summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorduritong <peter.meier+github@immerda.ch>2013-03-25 10:13:01 -0700
committerduritong <peter.meier+github@immerda.ch>2013-03-25 10:13:01 -0700
commitfe39acf930f0e5ff34bb00d6439ba42f895ba2f1 (patch)
tree6a1977c26d6e5cc9e5000e423646de582bb61efb
parente822d6140b1ffea7d85546062376a7e464a3cb61 (diff)
parent8a956cc2f1ad97d06e9a267312e55260ecb29eac (diff)
Merge pull request #9 from oxilion/fix_cgi
Fix cgi
-rw-r--r--README2
-rw-r--r--manifests/host/cgi.pp3
2 files changed, 4 insertions, 1 deletions
diff --git a/README b/README
index 1e47d27..f712682 100644
--- a/README
+++ b/README
@@ -76,3 +76,5 @@ To use this module, follow these directions:
For CentOS this is enabled in the default header config
h. Per default (on CentOS) munin will send warnings and critical messages to root
+
+ i. If you want to use host with cgi, you need to have specified a default $PATH for all execs: http://www.puppetcookbook.com/posts/set-global-exec-path.html
diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp
index 9980856..a19c432 100644
--- a/manifests/host/cgi.pp
+++ b/manifests/host/cgi.pp
@@ -1,8 +1,9 @@
class munin::host::cgi {
exec{'set_modes_for_cgi':
command => 'chgrp apache /var/log/munin /var/log/munin/munin-graph.log && chmod g+w /var/log/munin /var/log/munin/munin-graph.log && find /var/www/html/munin/* -maxdepth 1 -type d -exec chgrp -R apache {} \; && find /var/www/html/munin/* -maxdepth 1 -type d -exec chmod -R g+w {} \;',
+ command => 'chgrp apache /var/log/munin /var/log/munin/munin-graph.log && chmod g+w /var/log/munin /var/log/munin/munin-graph.log && find /var/www/html/munin/* -maxdepth 1 -type d -exec chgrp -R apache {} \; && find /var/www/html/munin/* -maxdepth 1 -type d -exec chmod -R g+w {} \;',
refreshonly => true,
- subscribe => File['/etc/munin/munin.conf.header'],
+ subscribe => Concat::Fragment['munin.conf.header'],
}
file{'/etc/logrotate.d/munin':