18 Nov
2007
18 Nov
'07
2:56 a.m.
URL: https://svn.lrde.epita.fr/svn/lrde-tools/trunk/buildbot
Git branch: master (HEAD: 11b299d)
ChangeLog:
2007-11-18 Benoit Sigoure <tsuna(a)lrde.epita.fr>
Do the necessary adjustments for the production BF.
* masters/apache_bf.conf: Adjust and add the various reverse proxies
to access the WebStatus from buildfarm.lrde.org.
* masters/buildfarm.sh (BUILDBOT_ROOT): Adjust.
* masters/menu.html: Add a link to the home page.
* masters/oln_master.cfg,
* masters/vaucanson_master.cfg: Password protect the WebStatus.
* masters/www/index.php: Adjust.
---
masters/ChangeLog | 11 +++++++++++
masters/apache_bf.conf | 33 +++++++++++++++------------------
masters/buildfarm.sh | 2 +-
masters/menu.html | 1 +
masters/oln_master.cfg | 5 +++--
masters/vaucanson_master.cfg | 5 +++--
masters/www/index.php | 9 ++++-----
7 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/masters/ChangeLog b/masters/ChangeLog
index daf1ffd..299f6ad 100644
--- a/masters/ChangeLog
+++ b/masters/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-18 Benoit Sigoure <tsuna(a)lrde.epita.fr>
+
+ Do the necessary adjustments for the production BF.
+ * masters/apache_bf.conf: Adjust and add the various reverse proxies
+ to access the WebStatus from buildfarm.lrde.org.
+ * masters/buildfarm.sh (BUILDBOT_ROOT): Adjust.
+ * masters/menu.html: Add a link to the home page.
+ * masters/oln_master.cfg,
+ * masters/vaucanson_master.cfg: Password protect the WebStatus.
+ * masters/www/index.php: Adjust.
+
2007-11-12 Benoit Sigoure <tsuna(a)lrde.epita.fr>
Adjust the default URLs.
diff --git a/masters/apache_bf.conf b/masters/apache_bf.conf
index 42d1474..a46b6b6 100644
--- a/masters/apache_bf.conf
+++ b/masters/apache_bf.conf
@@ -1,25 +1,22 @@
# vim:ft=apache
-Alias /buildfarm FIXME
-Alias /releases FIXME
+Alias /releases /work/build/releases
# Handle typos.
-Redirect permanent /release https://FIXME.lrde.epita.fr/releases
-
-<LocationMatch "/buildfarm">
- AuthType Basic
- AuthName "BuildFarm Authentication"
- AuthUserFile FIXME
- Require valid-user
-</LocationMatch>
-
-<LocationMatch "/releases">
- AuthType Basic
- AuthName "Pre-Releases Authentication"
- AuthUserFile FIXME
- Require valid-user
-</LocationMatch>
+#XXX Redirect permanent /release https://buildfarm.lrde.org/releases
+Redirect permanent /release http://buildfarm.lrde.org/releases
+# Do not put anything after this line
<IfModule mod_proxy.c>
ProxyRequests Off
ProxyVia On
-</IfModule> # Do not put anything after this line
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+
+ ProxyPass /oln/ http://127.0.0.1:8042/
+ ProxyPassReverse /oln/ http://127.0.0.1:8042/
+
+ ProxyPass /vaucanson/ http://127.0.0.1:8043/
+ ProxyPassReverse /vaucanson/ http://127.0.0.1:8043/
+</IfModule>
diff --git a/masters/buildfarm.sh b/masters/buildfarm.sh
index 56ba166..3ad9352 100755
--- a/masters/buildfarm.sh
+++ b/masters/buildfarm.sh
@@ -15,7 +15,7 @@ case "$1" in
;;
esac
-BUILDBOT_ROOT=${BUILDBOT_ROOT-.}
+BUILDBOT_ROOT=${BUILDBOT_ROOT-~/buildbot}
# Space separated list of directories where we found build masters.
buildmasters=''
diff --git a/masters/menu.html b/masters/menu.html
index b7ed1c8..d034431 100644
--- a/masters/menu.html
+++ b/masters/menu.html
@@ -36,6 +36,7 @@ body {
<body>
<div id="nav">
<ul>
+ <li><a href="/" target="top">Home</a></li>
<li><a href="waterfall"
target="content">Waterfall</a></li>
<li><a href="one_box_per_builder"
target="content">Latest Build</a></li>
<li><a href="one_line_per_build"
target="content">Recent Builds</a></li>
diff --git a/masters/oln_master.cfg b/masters/oln_master.cfg
index af145af..72657fc 100644
--- a/masters/oln_master.cfg
+++ b/masters/oln_master.cfg
@@ -151,8 +151,9 @@ c['status'] = []
import os
from buildbot.status import html
-c['status'].append(html.WebStatus(http_port="tcp:8042:interface=0.0.0.0",
- allowForce=True))
+c['status'].append(html.WebStatus(http_port="tcp:8042:interface=127.0.0.1",
+ allowForce=True,
+ userpass=[('build', 'glopglop')]))
from buildbot.status import mail
c['status'].append(mail.MailNotifier(fromaddr="buildbot(a)lrde.epita.fr"rde.epita.fr",
diff --git a/masters/vaucanson_master.cfg b/masters/vaucanson_master.cfg
index 30a9ff9..78c3230 100644
--- a/masters/vaucanson_master.cfg
+++ b/masters/vaucanson_master.cfg
@@ -151,8 +151,9 @@ c['status'] = []
import os
from buildbot.status import html
-c['status'].append(html.WebStatus(http_port="tcp:8043:interface=0.0.0.0",
- allowForce=True))
+c['status'].append(html.WebStatus(http_port="tcp:8043:interface=127.0.0.1",
+ allowForce=True,
+ userpass=[('build', 'glopglop')]))
from buildbot.status import mail
c['status'].append(mail.MailNotifier(fromaddr="buildbot(a)lrde.epita.fr"rde.epita.fr",
diff --git a/masters/www/index.php b/masters/www/index.php
index c1141e3..0a19e47 100644
--- a/masters/www/index.php
+++ b/masters/www/index.php
@@ -15,18 +15,17 @@
<h2>Latest builds</h2>
<a href="/releases/"><strong>All
releases</strong></a>
-- Total number of files: <span style="color:green"><?php
- die('FIXME: path to /srv/releases');
- echo `find /srv/releases -type f | wc -l`; ?></span>
+ echo `find /work/build/releases -type f | wc -l`; ?></span>
(<span style="color:green"><?php
- echo rtrim(`du -hs /srv/releases | awk '{print $1}'`)
- . rtrim(`df -h | awk '$1 == "/dev/sda2" { print " / " $2
}'`)
+ echo rtrim(`du -hs /work/build/releases | awk '{print $1}'`)
+ . rtrim(`df -h | awk '$1 == "/dev/hda1" { print " / " $2
}'`)
. '</span>)';
?><br>
Latest releases:
<table>
<tbody>
<?php
-echo `export LANG=C; exec 2>&1; find /srv/releases -type f \
+echo `export LANG=C; exec 2>&1; find /work/build/releases -type f \
| perl -w -e '
use strict;
use File::stat;