diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2015-06-04 18:34:13 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-06-04 18:42:12 +0200 |
| commit | f7b70ac18f9f585fe0e586b5b6eb9e8735822af2 (patch) | |
| tree | eec91d5f71468bf347ea5e5ace5962d09b1fbf48 /etc/apache2 | |
| parent | ee9c617576b85359a5b756b5ed07a8e62ce3a45c (diff) | |
| download | jenkins.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/apache2')
| l--------- | etc/apache2/conf-available/munin.conf | 1 | ||||
| -rw-r--r-- | etc/apache2/conf.d/munin.conf | 102 |
2 files changed, 1 insertions, 102 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/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> - |