diff options
| author | Micah Anderson <micah@riseup.net> | 2010-12-10 16:48:01 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-12-10 16:48:01 -0500 |
| commit | 74f66a8e77b153552ef52efee03187320e1ce877 (patch) | |
| tree | 9f842135e5a62df7d0ef503dcf045e19238ff013 /manifests/host | |
| parent | fefc399e7e28ec871d91089d535073c2bc705009 (diff) | |
standardize formatting
Diffstat (limited to 'manifests/host')
| -rw-r--r-- | manifests/host/cgi.pp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp index 45e0034..0cb3b32 100644 --- a/manifests/host/cgi.pp +++ b/manifests/host/cgi.pp @@ -1,14 +1,15 @@ class munin::host::cgi inherits munin::host { + case $operatingsystem { debian: { - exec{'set_modes_for_cgi': + 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 {} \;', refreshonly => true, subscribe => File['/etc/munin/munin.conf.header'], } } default: { - exec{'set_modes_for_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 {} \;', refreshonly => true, subscribe => File['/etc/munin/munin.conf.header'], @@ -16,7 +17,7 @@ class munin::host::cgi inherits munin::host { } } - file{'/etc/logrotate.d/munin': + file{ '/etc/logrotate.d/munin': source => [ "puppet://$server/modules/site-munin/config/host/${fqdn}/logrotate", "puppet://$server/modules/site-munin/config/host/logrotate.$operatingsystem", "puppet://$server/modules/site-munin/config/host/logrotate", @@ -24,4 +25,5 @@ class munin::host::cgi inherits munin::host { "puppet://$server/modules/munin/config/host/logrotate" ], owner => root, group => 0, mode => 0644; } + } |