[Qa-jenkins-scm] [jenkins.debian.net] 01/01: only update munin and apache2 configuration if changed
Holger Levsen
holger at moszumanska.debian.org
Mon Aug 10 09:26:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit 7c9dac9f5e31907cfae215fd982090e77ee44830
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Aug 10 11:24:58 2015 +0200
only update munin and apache2 configuration if changed
---
update_jdn.sh | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/update_jdn.sh b/update_jdn.sh
index d184265..bc7f4ec 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -242,28 +242,32 @@ sudo chown root.root /etc/sudoers.d/jenkins ; sudo chmod 700 /etc/sudoers.d/jenk
sudo chown root.root /etc/sudoers.d/jenkins-adm ; sudo chmod 700 /etc/sudoers.d/jenkins-adm
if [ "$HOSTNAME" = "jenkins" ] ; then
- if [ ! -e /etc/apache2/mods-enabled/proxy.load ] ; then
- sudo a2enmod proxy
- sudo a2enmod proxy_http
- sudo a2enmod rewrite
- sudo a2enmod ssl
- sudo a2enmod headers
- sudo a2enmod macro
- sudo a2enmod filter
+ if [ $BASEDIR/hosts/$HOSTNAME/etc/apache2 -nt $STAMP ] || [ ! -f $STAMP ] ; then
+ if [ ! -e /etc/apache2/mods-enabled/proxy.load ] ; then
+ sudo a2enmod proxy
+ sudo a2enmod proxy_http
+ sudo a2enmod rewrite
+ sudo a2enmod ssl
+ sudo a2enmod headers
+ sudo a2enmod macro
+ sudo a2enmod filter
+ fi
+ sudo a2ensite -q jenkins.debian.net
+ sudo 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
+ sudo service apache2 reload
fi
- sudo a2ensite -q jenkins.debian.net
- sudo 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
- sudo service apache2 reload
fi
-cd /etc/munin/plugins ; sudo rm -f postfix_* open_inodes df_inode interrupts irqstats threads proc_pri vmstat if_err_eth0 fw_forwarded_local fw_packets forks open_files users 2>/dev/null
-if [ "$HOSTNAME" = "jenkins" ] && [ ! -L /etc/munin/plugins/apache_accesses ] ; then
- for i in apache_accesses apache_volume ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done
+if [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] || [ ! -f $STAMP ] ; then
+ cd /etc/munin/plugins ; sudo rm -f postfix_* open_inodes df_inode interrupts irqstats threads proc_pri vmstat if_err_eth0 fw_forwarded_local fw_packets forks open_files users 2>/dev/null
+ if [ "$HOSTNAME" = "jenkins" ] && [ ! -L /etc/munin/plugins/apache_accesses ] ; then
+ for i in apache_accesses apache_volume ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done
+ fi
+ sudo service munin-node force-reload
fi
-sudo service munin-node force-reload
explain "packages configured."
#
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list