diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-11-11 20:00:10 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-11-11 20:00:10 +0000 |
| commit | 63c36f1f450232873395b7008079c1a85f397c07 (patch) | |
| tree | 805eca793f9f70e18011c0ef86936610d450501d /net-analyzer/munin/files | |
| parent | Version bump 1.4.75 (diff) | |
| download | historical-63c36f1f450232873395b7008079c1a85f397c07.tar.gz historical-63c36f1f450232873395b7008079c1a85f397c07.tar.bz2 historical-63c36f1f450232873395b7008079c1a85f397c07.zip | |
Install two different Apache configuration files for 2.2 and 2.4, as access compat doesn't work nor does the IfModule trick. Fix the log permission for cgi-html as well.
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342
Diffstat (limited to 'net-analyzer/munin/files')
| -rw-r--r-- | net-analyzer/munin/files/logrotate.d-munin.2 | 2 | ||||
| -rw-r--r-- | net-analyzer/munin/files/munin.apache.include | 26 | ||||
| -rw-r--r-- | net-analyzer/munin/files/munin.apache.include-2.4 | 28 |
3 files changed, 35 insertions, 21 deletions
diff --git a/net-analyzer/munin/files/logrotate.d-munin.2 b/net-analyzer/munin/files/logrotate.d-munin.2 index 32059b0305b1..96a163accbd6 100644 --- a/net-analyzer/munin/files/logrotate.d-munin.2 +++ b/net-analyzer/munin/files/logrotate.d-munin.2 @@ -20,7 +20,7 @@ nocreate } -/var/log/munin/munin-cgi-graph.log { +/var/log/munin/munin-cgi-graph.log /var/log/munin/munin-cgi-html.log { daily missingok rotate 7 diff --git a/net-analyzer/munin/files/munin.apache.include b/net-analyzer/munin/files/munin.apache.include index 3ca8f0710810..f8b2df5daa66 100644 --- a/net-analyzer/munin/files/munin.apache.include +++ b/net-analyzer/munin/files/munin.apache.include @@ -11,18 +11,11 @@ RewriteCond %{REQUEST_URI} !/static RewriteRule ^/munin/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L] </IfDefine> -<Directory "/usr/libexec/munin/cgi/"> +<Directory /usr/libexec/munin/cgi/> Options +ExecCGI - # for Apache < 2.4 - <IfModule !mod_authz_host.c> - Order Deny,Allow - Allow from all - </IfModule> - # for Apache >= 2.4 - <IfModule mod_authz_host.c> - Require all granted - </IfModule> + Order allow,deny + Allow from all <IfModule mod_fcgid.c> SetHandler fcgid-script @@ -32,14 +25,7 @@ RewriteRule ^/munin/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L] </IfModule> </Directory> -<Directory "/etc/munin/static"> - # for Apache < 2.4 - <IfModule !mod_authz_host.c> - Order Deny,Allow - Allow from all - </IfModule> - # for Apache >= 2.4 - <IfModule mod_authz_host.c> - Require all granted - </IfModule> +<Directory /etc/munin/static> + Order allow,deny + Allow from all </Directory> diff --git a/net-analyzer/munin/files/munin.apache.include-2.4 b/net-analyzer/munin/files/munin.apache.include-2.4 new file mode 100644 index 000000000000..ec69cbb07b91 --- /dev/null +++ b/net-analyzer/munin/files/munin.apache.include-2.4 @@ -0,0 +1,28 @@ +# -*- apache -*- + +ScriptAlias /munin-cgi/ /usr/libexec/munin/cgi/ +Alias /munin/static /etc/munin/static + +<IfDefine MUNIN_HTML_CGI> +RewriteEngine on + +RewriteCond %{REQUEST_URI} (/|\.html)$ +RewriteCond %{REQUEST_URI} !/static +RewriteRule ^/munin/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L] +</IfDefine> + +<Directory /usr/libexec/munin/cgi/> + Options +ExecCGI + Require all granted + + <IfModule mod_fcgid.c> + SetHandler fcgid-script + </IfModule> + <IfModule !mod_fcgid.c> + SetHandler cgi-script + </IfModule> +</Directory> + +<Directory /etc/munin/static> + Require all granted +</Directory> |