summaryrefslogtreecommitdiffstats
path: root/update_jdn.sh
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 /update_jdn.sh
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 'update_jdn.sh')
-rwxr-xr-xupdate_jdn.sh3
1 files changed, 2 insertions, 1 deletions
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