Merge remote-tracking branch 'githubmirror/master'

Integrate the changes in other changes I already merged.

Conflicts:
	README
	manifests/host/cgi.pp

diff --cc manifests/host.pp
index 05dcb5e,0992d2b..007c43a
--- 1/manifests/host.pp
--- 2/manifests/host.pp
+++ b/manifests/host.pp
@@@ -4,6 -4,7 +4,7 @@@
  
  class munin::host(
    $cgi_graphing = false,
 -  $cgi_owner = 'apache',
++  $cgi_owner = 'os_default',
    $export_tag = 'munin'
  ) {
    package {"munin": ensure => installed, }

diff --cc manifests/host/cgi.pp
index 0c11d32,6e5efcd..1c0072d
--- 1/manifests/host/cgi.pp
--- 2/manifests/host/cgi.pp
+++ b/manifests/host/cgi.pp
@@@ -1,18 -1,8 +1,29 @@@
- class munin::host::cgi {
- 
+ class munin::host::cgi(
 -  $owner = 'apache'
++  $owner = 'os_default'
+ ) {
 +  case $::operatingsystem {
 +    debian,ubuntu: {
-       $apache_user   = 'www-data'
 +      $document_root = '/var/www/munin'
 +    }
 +    default: {
-       $apache_user   = 'apache'
 +      $document_root = '/var/www/html/munin'
 +    }
 +  }
++  if $owner == 'os_default' {
++    case $::operatingsystem {
++      debian,ubuntu: {
++        $apache_user = 'www-data'
++      }
++      default: {
++        $apache_user = 'apache'
++      }
++    }
++  } else {
++    $apache_user = $owner
++  }
 +
    exec{'set_modes_for_cgi':
 -    command     => "chgrp ${owner} /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 ${owner} {} \; && find /var/www/html/munin/* -maxdepth 1 -type d -exec chmod -R g+w {} \;",
 +    command     => "chgrp ${apache_user} /var/log/munin /var/log/munin/munin-graph.log && chmod g+w /var/log/munin /var/log/munin/munin-graph.log && find ${document_root}/* -maxdepth 1 -type d -exec chgrp -R ${apache_user} {} \; && find ${document_root}/* -maxdepth 1 -type d -exec chmod -R g+w {} \;",
      refreshonly => true,
      subscribe   => Concat::Fragment['munin.conf.header'],
    }