From 8bb59298e89547eeb1861c23cea313448effbadb Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 5 Nov 2012 12:00:06 +0100 Subject: small enhancements --- etc/munin/plugins/jenkins_builds | 2 +- etc/squid/squid.conf | 2 +- etc/sudoers.d/jenkins | 2 +- update_jdn.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/munin/plugins/jenkins_builds b/etc/munin/plugins/jenkins_builds index 91b531fa..d0caa97b 100755 --- a/etc/munin/plugins/jenkins_builds +++ b/etc/munin/plugins/jenkins_builds @@ -31,7 +31,7 @@ fi if [ "$1" = "config" ]; then - echo 'graph_title Jenkins Builds' + echo 'graph_title Jenkins Builds in the last 24h' echo 'graph_args --base 1000 -l 0 ' echo 'graph_scale no' echo 'graph_vlabel Jenkins Builds per category in the last 24h' diff --git a/etc/squid/squid.conf b/etc/squid/squid.conf index 22a83880..f49213f5 100644 --- a/etc/squid/squid.conf +++ b/etc/squid/squid.conf @@ -1942,7 +1942,7 @@ hierarchy_stoplist cgi-bin ? # (hard coded at 1 MB). # #Default: -cache_dir ufs /var/spool/squid 100 16 102400 +cache_dir ufs /var/spool/squid 16384 16 1024 # TAG: store_dir_select_algorithm # Set this to 'round-robin' as an alternative. diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index d7a27de8..79aab06a 100644 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins @@ -1 +1 @@ -jenkins ALL= NOPASSWD: /usr/sbin/debootstrap *, NOPASSWD: /usr/sbin/chroot /chroots/*, NOPASSWD: /bin/rm -rf /chroots/*, NOPASSWD: /bin/umount -l /chroots/* +jenkins ALL= NOPASSWD: /usr/sbin/debootstrap *, NOPASSWD: /usr/sbin/chroot /chroots/*, NOPASSWD: /bin/rm -rf /chroots/*, NOPASSWD: /bin/umount -l /chroots/*, NOPASSWD: /usr/bin/du * diff --git a/update_jdn.sh b/update_jdn.sh index 747cbe3c..99e59cc0 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -44,7 +44,7 @@ fi sudo chown root.root /etc/sudoers.d/jenkins ; sudo chmod 700 /etc/sudoers.d/jenkins sudo ln -sf /etc/apache2/sites-available/jenkins.debian.net /etc/apache2/sites-enabled/000-default sudo service apache2 reload -cd /etc/munin/plugins ; sudo rm -f postfix_* open_inodes df_inode interrupts diskstats irqstats threads proc_pri vmstat if_err_eth0 fw_forwarded_local forks open_files users 2>/dev/null +cd /etc/munin/plugins ; sudo rm -f postfix_* open_inodes df_inode interrupts diskstats irqstats threads proc_pri vmstat if_err_eth0 fw_forwarded_local fw_packets forks open_files users 2>/dev/null [ -L apache_accesses ] || for i in apache_accesses apache_volume ; do ln -s /usr/share/munin/plugins/$i $i ; done explain "Packages configured." -- cgit v1.2.3-70-g09d2