summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-11-12 13:57:24 +0100
committerHolger Levsen <holger@layer-acht.org>2012-11-12 13:57:24 +0100
commit4254283dab529a834c96cd7e873d901f528e94ad (patch)
tree8767e28a23532ff0eb07b174a8a44ef3f91773b9
parent59dddf8cc4144dd1ccb16ce98115a69d4fffa9cc (diff)
downloadjenkins.debian.net-4254283dab529a834c96cd7e873d901f528e94ad.tar.xz
also ignore www.debian.org/devel/website/stats/.* as well as prepare calamaris and visitors setup
-rw-r--r--etc/apache2/sites-available/jenkins.debian.net2
-rw-r--r--job-cfg/webcheck.yaml2
-rwxr-xr-xupdate_jdn.sh2
3 files changed, 4 insertions, 2 deletions
diff --git a/etc/apache2/sites-available/jenkins.debian.net b/etc/apache2/sites-available/jenkins.debian.net
index 75626d56..c26de24d 100644
--- a/etc/apache2/sites-available/jenkins.debian.net
+++ b/etc/apache2/sites-available/jenkins.debian.net
@@ -30,6 +30,8 @@
# proxy everything but /munin
ProxyPass /munin !
ProxyPass /server-status !
+ ProxyPass /visitors-report.html !
+ ProxyPass /calamaris !
ProxyPass /robots.txt http://localhost:8080/userContent/robots.txt
ProxyPass / http://localhost:8080/
diff --git a/job-cfg/webcheck.yaml b/job-cfg/webcheck.yaml
index 8597bad2..1c2aaec5 100644
--- a/job-cfg/webcheck.yaml
+++ b/job-cfg/webcheck.yaml
@@ -117,7 +117,7 @@
jobs:
- '{name}_www_debian_org':
webcheck_url: 'http://www.debian.org'
- webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no qa.debian.org/developer.php security.debian.org/pool packages.debian.org i18n.debian.org/material cve.mitre.org/cgi-bin online.securityfocus.com/bid bugs.debian.org/\d\d\d bugs.debian.org/cgi-bin/ \.dsc$ \.diff.gz$ \.tar.gz \.deb$ www.debian.org/security www.debian.org/News www.debian.org/mirror/list \.\./\.\. www.debian.org/doc/.*'
+ webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no qa.debian.org/developer.php security.debian.org/pool packages.debian.org i18n.debian.org/material cve.mitre.org/cgi-bin online.securityfocus.com/bid bugs.debian.org/\d\d\d bugs.debian.org/cgi-bin/ \.dsc$ \.diff.gz$ \.tar.gz \.deb$ www.debian.org/security www.debian.org/News www.debian.org/mirror/list \.\./\.\. www.debian.org/doc/.* www.debian.org/devel/website/stats/.*'
timed: "0 1 1 * *"
- '{name}_www_debian_org_security':
webcheck_url: 'http://www.debian.org/security/'
diff --git a/update_jdn.sh b/update_jdn.sh
index 1fd8a513..cacbf390 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 \
+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 \
build-essential python-setuptools \
debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck
explain "Packages installed."