|
[-]
[+]
|
Changed |
munin.changes
|
|
|
|
[-]
[+]
|
Changed |
munin.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
munin-2.0-beta4-http_loadtime.patch
^
|
| @@ -1,11 +0,0 @@
---- plugins/node.d/http_loadtime.in.orig 2011-09-03 10:23:19.014593592 +0200
-+++ plugins/node.d/http_loadtime.in 2011-09-03 10:23:55.097543588 +0200
-@@ -40,7 +40,7 @@
- if [ "$1" = "autoconf" ]; then
- # Need to actually test that the url is reachable, it makes
- # no sense to install the plugin if there is no webserver on localhost.
-- echo "no (autoconfiguration not working correctly)
-+ echo "no (autoconfiguration not working correctly)"
- exit 0
-
- result="yes"
|
|
|
Deleted |
munin-2.0-beta4.tar.bz2
^
|
|
|
Deleted |
munin-2.0-beta7.tar.bz2
^
|
|
|
Deleted |
munin-2.0-rc2.tar.bz2
^
|
|
|
Deleted |
munin-2.0-rc6.tar.bz2
^
|
|
[-]
[+]
|
Added |
munin-vhost.template
^
|
| @@ -0,0 +1,45 @@
+<VirtualHost *:80>
+ ServerName munin.example.org
+ ServerAlias munin
+
+ ServerAdmin info@example.org
+
+ DocumentRoot /srv/www/munin.example.org
+
+ ErrorLog /var/log/apache2/munin.example.org-error.log
+ CustomLog /var/log/apache2/munin.example.org-access.log combined
+
+ ServerSignature Off
+
+ Alias /static /etc/munin/static
+
+ # Rewrites
+ RewriteEngine On
+
+ # HTML
+ RewriteCond %{REQUEST_URI} !^/static
+ RewriteCond %{REQUEST_URI} .html$ [or]
+ RewriteCond %{REQUEST_URI} =/
+ RewriteRule ^/(.*) /srv/www/cgi-bin/munin-cgi-html/$1 [L]
+
+ # Images
+
+ # - remove path to munin-cgi-graph, if present
+ RewriteRule ^/cgi-bin/munin-cgi-graph/(.*) /$1
+
+ RewriteCond %{REQUEST_URI} !^/static
+ RewriteCond %{REQUEST_URI} .png$
+ RewriteRule ^/(.*) /srv/www/cgi-bin/munin-cgi-graph/$1 [L]
+
+ # Ensure we can run (fast)cgi scripts
+ <Directory "/usr/lib/cgi-bin">
+ Options +ExecCGI
+ <IfModule mod_fcgid.c>
+ SetHandler fcgid-script
+ </IfModule>
+ <IfModule !mod_fcgid.c>
+ SetHandler cgi-script
+ </IfModule>
+ </Directory>
+
+</VirtualHost>
|
