From f7b70ac18f9f585fe0e586b5b6eb9e8735822af2 Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
Date: Thu, 4 Jun 2015 18:34:13 +0200
Subject: apache: directly use the apache conf from /etc/munin, use
 a2en{site,conf} to enable the site and the conf

---
 etc/apache2/conf.d/munin.conf | 102 ------------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 etc/apache2/conf.d/munin.conf

(limited to 'etc/apache2/conf.d/munin.conf')

diff --git a/etc/apache2/conf.d/munin.conf b/etc/apache2/conf.d/munin.conf
deleted file mode 100644
index feb4e9fd..00000000
--- a/etc/apache2/conf.d/munin.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-# Enable this for template generation
-Alias /munin /var/cache/munin/www
-
-# Enable this for cgi-based templates
-#Alias /munin-cgi/static /var/cache/munin/www/static
-#ScriptAlias /munin-cgi /usr/lib/munin/cgi/munin-cgi-html
-#<Location /munin-cgi>
-#	Order allow,deny
-#	Allow from localhost 127.0.0.0/8 ::1
-#	AuthUserFile /etc/munin/munin-htpasswd
-#	AuthName "Munin"
-#	AuthType Basic
-#	require valid-user
-#</Location>
-
-<Directory /var/cache/munin/www>
-        Order allow,deny
-        Allow from all
-        Options None
-
-	# This file can be used as a .htaccess file, or a part of your apache
-	# config file.
-	#
-	# For the .htaccess file option to work the munin www directory
-	# (/var/cache/munin/www) must have "AllowOverride all" or something 
-	# close to that set.
-	#
-
-	# AuthUserFile /etc/munin/munin-htpasswd
-	# AuthName "Munin"
-	# AuthType Basic
-	# require valid-user
-
-	# This next part requires mod_expires to be enabled.
-	#
-	
-	# Set the default expiration time for files to 5 minutes 10 seconds from
-	# their creation (modification) time.  There are probably new files by
-	# that time. 
-	#
-
-    <IfModule mod_expires.c>
-        ExpiresActive On
-    	ExpiresDefault M310
-    </IfModule>
-
-</Directory> 
-
-# Enables fastcgi for munin-cgi-html if present
-#<Location /munin-cgi>
-#    <IfModule mod_fastcgi.c>
-#        SetHandler fastcgi-script
-#    </IfModule>
-#</Location>
-
-#<Location /munin-cgi/static>
-#	SetHandler None
-#</Location>
-
-# Enables fastcgi for munin-cgi-graph if present
-ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph
-<Location /munin-cgi/munin-cgi-graph>
-	Order allow,deny
-	Allow from localhost 127.0.0.0/8 ::1
-	# AuthUserFile /etc/munin/munin-htpasswd
-	# AuthName "Munin"
-	# AuthType Basic
-	# require valid-user
-        <IfModule mod_fastcgi.c>
-                SetHandler fastcgi-script
-        </IfModule>
-</Location>
-
-ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html
-<Location /munin-cgi/munin-cgi-html>
-	Order allow,deny
-	Allow from localhost 127.0.0.0/8 ::1
-	# AuthUserFile /etc/munin/munin-htpasswd
-	# AuthName "Munin"
-	# AuthType Basic
-	# require valid-user
-        <IfModule mod_fastcgi.c>
-                SetHandler fastcgi-script
-        </IfModule>
-</Location>
-
-ExtendedStatus On
-<IfModule mod_status.c>
-    #
-    # Allow server status reports generated by mod_status,
-    # with the URL of http://servername/server-status
-    # Change the ".example.com" to match your domain to enable.
-    #
-    <Location /server-status>
-        SetHandler server-status
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1
-	Allow from 46.16.73.183
-    </Location>
-</IfModule>
-
-- 
cgit v1.2.3-54-g00ecf