diff options
| author | Kristian Lyngstol <kristian@bohemians.org> | 2015-04-02 19:24:45 +0200 |
|---|---|---|
| committer | Kristian Lyngstol <kristian@bohemians.org> | 2015-04-02 19:24:45 +0200 |
| commit | 0d8bba263dc195147d6fdb09662e7926f0a58b3e (patch) | |
| tree | 4c570b4376c323e585120e7695b8715be7aa8881 /web/etc/apache2/munin.tg15.gathering.org | |
| parent | e4354b47bd8891c5b1ee591fdf74b3ca67eee461 (diff) | |
Bump lots of changes
Diffstat (limited to 'web/etc/apache2/munin.tg15.gathering.org')
| -rw-r--r-- | web/etc/apache2/munin.tg15.gathering.org | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/web/etc/apache2/munin.tg15.gathering.org b/web/etc/apache2/munin.tg15.gathering.org index 3e8eca4..aaa3848 100644 --- a/web/etc/apache2/munin.tg15.gathering.org +++ b/web/etc/apache2/munin.tg15.gathering.org @@ -1,7 +1,6 @@ <VirtualHost *:8080> ServerAdmin drift@gathering.org ServerName munin.tg15.gathering.org - ServerAlias munin.tg15.gathering.org # Enable this for template generation Alias /munin /var/cache/munin/www @@ -47,11 +46,18 @@ # that time. # - AuthUserFile /root/tgmanage/web/.htpasswd - AuthName "Tech:Server Secret Volcano Lair" - AuthType Basic - require valid-user - + SetEnvIF ^X-Forwarded-For$ "^185\.12\.59\.12$" AllowIP + SetEnvIF ^X-Forwarded-For$ "^2a02:ed02:1337::12$" AllowIP + + <RequireAny> + AuthUserFile /root/tgmanage/web/.htpasswd + AuthName "Tech:Server Secret Volcano Lair" + AuthType Basic + Require valid-user + + Require env AllowIP + </RequireAny> + <IfModule mod_expires.c> ExpiresActive On ExpiresDefault M310 |