From bf4b60af0b922dd2ad3cab151f54f5a323ce764d Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Mon, 12 Aug 2024 13:40:31 +0200
Subject: [PATCH] ff

---
 .../mgrote_munin_server/templates/apache.conf | 44 +++----------------
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/roles/mgrote_munin_server/templates/apache.conf b/roles/mgrote_munin_server/templates/apache.conf
index 01a6c180..355c80bd 100644
--- a/roles/mgrote_munin_server/templates/apache.conf
+++ b/roles/mgrote_munin_server/templates/apache.conf
@@ -1,48 +1,16 @@
-Documentroot /var/cache/munin/www
-
-ServerName {{ munin_servername }}
-
+Alias /munin /var/cache/munin/www
 <Directory /var/cache/munin/www>
-        Satisfy Any
-        Options none
-    <IfModule mod_expires.c>
-        ExpiresActive On
-        ExpiresDefault M310
-    </IfModule>
+        Require local
+        Options None
 </Directory>
 
-Alias / /var/cache/munin/www/
-<Directory /usr/lib/munin/cgi>
-        Satisfy Any
-        Options +ExecCGI
+ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
+<Location /munin-cgi/munin-cgi-graph>
+        Require local
         <IfModule mod_fcgid.c>
             SetHandler fcgid-script
         </IfModule>
         <IfModule !mod_fcgid.c>
             SetHandler cgi-script
         </IfModule>
-</Directory>
-
-<Location /munin-cgi>
-        Satisfy Any
-</Location>
-
-<Location /munin-cgi/munin-cgi-graph>
-         Satisfy Any
-         <IfModule mod_fcgid.c>
-             SetHandler fcgid-script
-         </IfModule>
-         <IfModule !mod_fcgid.c>
-             SetHandler cgi-script
-         </IfModule>
-</Location>
-
-<Location /munin-cgi/munin-cgi-html>
-         Satisfy Any
-         <IfModule mod_fcgid.c>
-             SetHandler fcgid-script
-         </IfModule>
-         <IfModule !mod_fcgid.c>
-             SetHandler cgi-script
-         </IfModule>
 </Location>