summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-06-04 18:34:13 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-04 18:42:12 +0200
commitf7b70ac18f9f585fe0e586b5b6eb9e8735822af2 (patch)
treeeec91d5f71468bf347ea5e5ace5962d09b1fbf48 /etc
parentee9c617576b85359a5b756b5ed07a8e62ce3a45c (diff)
downloadjenkins.debian.net-f7b70ac18f9f585fe0e586b5b6eb9e8735822af2.tar.xz
apache: directly use the apache conf from /etc/munin, use a2en{site,conf} to enable the site and the conf
Diffstat (limited to 'etc')
l---------etc/apache2/conf-available/munin.conf1
-rw-r--r--etc/munin/apache.conf (renamed from etc/apache2/conf.d/munin.conf)14
2 files changed, 5 insertions, 10 deletions
diff --git a/etc/apache2/conf-available/munin.conf b/etc/apache2/conf-available/munin.conf
new file mode 120000
index 00000000..56fedfa9
--- /dev/null
+++ b/etc/apache2/conf-available/munin.conf
@@ -0,0 +1 @@
+../../munin/apache.conf \ No newline at end of file
diff --git a/etc/apache2/conf.d/munin.conf b/etc/munin/apache.conf
index feb4e9fd..95786274 100644
--- a/etc/apache2/conf.d/munin.conf
+++ b/etc/munin/apache.conf
@@ -14,8 +14,7 @@ Alias /munin /var/cache/munin/www
#</Location>
<Directory /var/cache/munin/www>
- Order allow,deny
- Allow from all
+ Require all granted
Options None
# This file can be used as a .htaccess file, or a part of your apache
@@ -60,8 +59,7 @@ Alias /munin /var/cache/munin/www
# 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
+ Require all granted
# AuthUserFile /etc/munin/munin-htpasswd
# AuthName "Munin"
# AuthType Basic
@@ -73,8 +71,7 @@ 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-html>
- Order allow,deny
- Allow from localhost 127.0.0.0/8 ::1
+ Require all granted
# AuthUserFile /etc/munin/munin-htpasswd
# AuthName "Munin"
# AuthType Basic
@@ -93,10 +90,7 @@ ExtendedStatus On
#
<Location /server-status>
SetHandler server-status
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1
- Allow from 46.16.73.183
+ Require ip 127.0.0.1 46.16.73.183
</Location>
</IfModule>