roles/mgrote_munin_server/templates/apache.conf

@@ -1,41 +1,24 @@
 <VirtualHost *:80>
     ServerName {{ munin_servername }}
-    ServerAlias munin
 
-    ServerAdmin  info@example.org
+    # Redirect requests without /munin to /munin
+    RedirectMatch ^/$ /munin/
 
-    DocumentRoot /var/www
+    # Existing configuration for serving /munin
-
+    Alias /munin /var/cache/munin/www
-    # Rewrite rules to serve traffic from the root instead of /munin-cgi
+    <Directory /var/cache/munin/www>
-    RewriteEngine On
+            Require all granted
-    # Static files
+            Options None
-    RewriteRule ^/favicon.ico /var/cache/munin/www/static/favicon.ico [L]
+    </Directory>
-    RewriteRule ^/static/(.*) /var/cache/munin/www/static/$1          [L]
-    # HTML
-    RewriteRule ^(/.*\.html)?$ /munin-cgi/munin-cgi-html/$1 [PT]
-    # Images
-    RewriteRule ^/munin-cgi/munin-cgi-graph/(.*) /$1
-    RewriteCond %{REQUEST_URI} !^/static
-    RewriteRule ^/(.*.png)$ /munin-cgi/munin-cgi-graph/$1 [L,PT]
 
     ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
-    ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html
+    <Location /munin-cgi/munin-cgi-graph>
-
+            Require all granted
-    <Directory /etc/munin/static>
+            <IfModule mod_fcgid.c>
-        Require all granted
+                SetHandler fcgid-script
-    </Directory>
+            </IfModule>
-
+            <IfModule !mod_fcgid.c>
-    <Directory /usr/lib/munin/cgi>
+                SetHandler cgi-script
-        Require all granted
+            </IfModule>
-        <IfModule mod_fcgid.c>
+    </Location>
-            SetHandler fcgid-script
-        </IfModule>
-        <IfModule !mod_fcgid.c>
-            SetHandler cgi-script
-        </IfModule>
-    </Directory>
-
-    CustomLog /var/log/apache2/munin.example.org-access.log combined
-    ErrorLog  /var/log/apache2/munin.example.org-error.log
 </VirtualHost>
-# http://guide.munin-monitoring.org/en/latest/example/webserver/apache-cgi.html