diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | etc/apache2/sites-available/jenkins.debian.net | 1 | ||||
| -rwxr-xr-x | etc/cron.daily/visitors | 23 | ||||
| -rwxr-xr-x | update_jdn.sh | 1 |
4 files changed, 1 insertions, 26 deletions
diff --git a/debian/control b/debian/control index 2bebd81d..3f25fe10 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git Package: jenkins.debian.net-setup Architecture: all Depends: ${misc:Depends}, jenkins.debian.net-bin, - vim, screen, less, etckeeper, moreutils, curl, mtr-tiny, dstat, devscripts, bash-completion, shorewall, shorewall6, cron-apt, apt-listchanges, munin, calamaris, visitors, procmail, libjson-rpc-perl, libfile-touch-perl, zutils, ip2host, apache2, python-yaml, python-pip, + vim, screen, less, etckeeper, moreutils, curl, mtr-tiny, dstat, devscripts, bash-completion, shorewall, shorewall6, cron-apt, apt-listchanges, munin, calamaris, procmail, libjson-rpc-perl, libfile-touch-perl, zutils, ip2host, apache2, python-yaml, python-pip, build-essential, python-setuptools Recommends: jenkins-job-builder Description: Stuff to setup a jenkins.debian.net instance diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net index b9e0667c..c6009777 100644 --- a/etc/apache2/sites-available/jenkins.debian.net +++ b/etc/apache2/sites-available/jenkins.debian.net @@ -130,7 +130,6 @@ Use common-debian-service-https-redirect reproducible.debian.net # proxy everything but a few urls ProxyPass /munin ! ProxyPass /server-status ! - ProxyPass /visitors-report.html ! ProxyPass /calamaris ! ProxyPass /robots.txt http://localhost:8080/userContent/robots.txt # map /d-i-preseed-cfgs to /UserContent/d-i-preseed-cfgs diff --git a/etc/cron.daily/visitors b/etc/cron.daily/visitors deleted file mode 100755 index d9b74f86..00000000 --- a/etc/cron.daily/visitors +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Copyright 2012 Holger Levsen <holger@layer-acht.org> -# released under the GPLv=2 - -[ -x /usr/bin/visitors ] || exit 0 -[ -x /usr/bin/ip2host ] || exit 0 - -if [ ! -f /usr/share/doc/zutils/copyright ] ; then - echo package zutils needs to be installed too - exit 1 -fi - -LOGS=$(mktemp) -DOT=$(mktemp) -# FIXME: provide monthly stats and don't run this daily -zcat /var/log/apache2/access.log* | grep -v 127.0.0.1 | sort | ip2host > $LOGS - -visitors --debug -AKMY -m 30 $LOGS > /var/www/visitors-report.html 2> /dev/null -#visitors --debug -VT -m 30 --prefix https://jenkins.debian.net $LOGS > $DOT -# dot -Tpng -o/var/lib/www/visitors-report-graph.png $DOT - -rm $LOGS $DOT diff --git a/update_jdn.sh b/update_jdn.sh index 0f868aea..f08f3b3e 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -72,7 +72,6 @@ sudo apt-get install vim \ cron-apt \ apt-listchanges \ calamaris \ - visitors \ procmail \ libjson-rpc-perl \ libfile-touch-perl \ |