aboutsummaryrefslogtreecommitdiff
path: root/control
diff options
context:
space:
mode:
authorMichael Hudson <michael.hudson@linaro.org>2011-02-24 16:05:41 +1300
committerMichael Hudson <michael.hudson@linaro.org>2011-02-24 16:05:41 +1300
commit63d2e8f1eda92a0f252169baa5c3c2c238cbc359 (patch)
tree166d881b3d49ac054a6ca6002e9d7a516f84c084 /control
parent03c5aaf5a1e4997f73c05694fa8b8d2560cc1dcb (diff)
serve jenkins at /jenkins not /
Diffstat (limited to 'control')
-rwxr-xr-xcontrol/setup-control-node7
1 files changed, 4 insertions, 3 deletions
diff --git a/control/setup-control-node b/control/setup-control-node
index 38c9625..57635b2 100755
--- a/control/setup-control-node
+++ b/control/setup-control-node
@@ -17,7 +17,8 @@ echo 'deb http://pkg.jenkins-ci.org/debian binary/' | sudo tee /etc/apt/sources.
sudo apt-get update
sudo apt-get install -y jenkins
-sudo sed -i 's/HTTP_PORT=8080/HTTP_PORT=9090/' /etc/default/jenkins
+sudo sed -i 's%HTTP_PORT=8080%HTTP_PORT=9090%' /etc/default/jenkins
+sudo sed -i 's%JENKINS_ARGS="%&--prefix=/jenkins %' /etc/default/jenkins
sudo service jenkins restart
cd ~jenkins
sudo -H -u jenkins bzr init
@@ -74,8 +75,8 @@ cat <<EOF | sudo tee /etc/apache2/sites-available/android-build.linaro.org > /de
</Proxy>
ProxyPreserveHost on
- ProxyPass / http://localhost:9090/
- ProxyPassReverse / http://localhost:9090/
+ ProxyPass /jenkins http://localhost:9090/jenkins
+ ProxyPassReverse /jenkins http://localhost:9090/jenkins
Header edit Location ^http://android-build.linaro.org https://android-build.linaro.org