summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-12-10 19:05:17 +0100
committerHolger Levsen <holger@layer-acht.org>2012-12-10 19:05:17 +0100
commit9bcaf7f81a01fe80f633ac4363c33a8b8e0c9fc0 (patch)
tree1256ccb2e61f68820415d21c0fe1614ed3143204
parent85106f4c835c6c12f3ee1755b1b2429dd1eed3d1 (diff)
downloadjenkins.debian.net-9bcaf7f81a01fe80f633ac4363c33a8b8e0c9fc0.tar.xz
run daily visitors report
-rw-r--r--TODO4
-rwxr-xr-xetc/cron.daily/visitors15
-rwxr-xr-xupdate_jdn.sh2
3 files changed, 18 insertions, 3 deletions
diff --git a/TODO b/TODO
index 2220dee4..4164bf82 100644
--- a/TODO
+++ b/TODO
@@ -15,8 +15,8 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian.
== General ToDo
* create general and job specific housekeeping jobs
-* keep git+svn urls, and use commit hooks. also better for test setups of this install :)
-* run calamaris, visitors etc
+* keep git+svn urls, and use commit hooks. also better for test setups of this setup as well as overall stability.
+* run calamaris properly
* proper git repo url, outside users/holger
** same for /srv/jenkins.debian.net-scm-sync.git
* fully automate backup and backup /var/lib/jenkins/jobs /var/lib/munin /var/log /root/ too
diff --git a/etc/cron.daily/visitors b/etc/cron.daily/visitors
new file mode 100755
index 00000000..3fffeecb
--- /dev/null
+++ b/etc/cron.daily/visitors
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Copyright 2012 Holger Levsen <holger@layer-acht.org>
+# released under the GPLv=2
+
+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
+#visitors --debug -VT -m 30 --prefix http://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 df3bb596..3d48e5c3 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -23,7 +23,7 @@ done
# install packages we need
# (more or less grouped into more-then-nice-to-have, needed-while-things-are-new, needed)
#
-sudo apt-get install 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 \
+sudo apt-get install 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 \
build-essential python-setuptools \
debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck poxml qemu vncsnapshot imagemagick ffmpeg2theora python-twisted python-imaging
explain "Packages installed."