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 | |
| 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
| l--------- | etc/apache2/conf-available/munin.conf | 1 | ||||
| -rw-r--r-- | etc/munin/apache.conf (renamed from etc/apache2/conf.d/munin.conf) | 14 | ||||
| -rwxr-xr-x | update_jdn.sh | 3 |
3 files changed, 7 insertions, 11 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> diff --git a/update_jdn.sh b/update_jdn.sh index 3c6c7443..a2af8cf9 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -216,7 +216,8 @@ if [ ! -e /etc/apache2/mods-enabled/proxy.load ] ; then fi sudo chown root.root /etc/sudoers.d/jenkins ; sudo chmod 700 /etc/sudoers.d/jenkins sudo chown root.root /etc/sudoers.d/jenkins-adm ; sudo chmod 700 /etc/sudoers.d/jenkins-adm -sudo ln -sf /etc/apache2/sites-available/jenkins.debian.net /etc/apache2/sites-enabled/jenkins.conf +sudo a2ensite -q jenkins.debian.net +auso a2enconf -q munin sudo chown jenkins-adm.jenkins-adm /etc/apache2/sites-enabled/jenkins.conf # for reproducible.d.n url rewriting: [ -L /var/www/userContent ] || sudo ln -sf /var/lib/jenkins/userContent /var/www/userContent |