summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/apache2/conf.d/munin16
-rw-r--r--etc/apache2/sites-available/jenkins.debian.net5
2 files changed, 19 insertions, 2 deletions
diff --git a/etc/apache2/conf.d/munin b/etc/apache2/conf.d/munin
index 2c77e185..e81528d7 100644
--- a/etc/apache2/conf.d/munin
+++ b/etc/apache2/conf.d/munin
@@ -84,3 +84,19 @@ ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html
</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.77.49
+ </Location>
+</IfModule>
+
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index dc2d5b59..75f7f672 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -28,8 +28,9 @@
</Proxy>
ProxyPreserveHost on
# proxy everything but /munin
- ProxyPass /munin !
- ProxyPass / http://localhost:8080/
+ ProxyPass /munin !
+ ProxyPass /server-status !
+ ProxyPass / http://localhost:8080/
ErrorLog ${APACHE_LOG_DIR}/error.log