more workingness

1 files changed, 14 insertions, 4 deletions

diff --git a/control/setup-control-node b/control/setup-control-node
index aa4125f..03dad73 100755
--- a/control/setup-control-node
+++ b/control/setup-control-node
@@ -38,13 +38,15 @@ sudo -H -u jenkins bzr ci -m 'initial import'
 sudo -H -u jenkins chmod a+X -R .bzr
 sudo chmod a+xr ~jenkins
 
+# Configuring jenkins is hard to automate :(
+
 cd
 bzr co ~jenkins jenkins-config
 
 # +++ APACHE +++
 
 # enable mod proxy
-sudo apt-get install -y apache2
+sudo apt-get install -y apache2 libapache2-mod-wsgi
 sudo a2enmod proxy
 sudo a2enmod proxy_http
 sudo a2enmod headers
@@ -168,8 +170,17 @@ bzr get lp:linaro-android-mirror
 
 sudo apt-get install -y python-virtualenv python-lxml python-openid tidy
 sudo adduser --system build-system-frontend
+sudo mkdir /var/lib/linaro-abs-frontend/
+sudo chown www-data /var/lib/linaro-abs-frontend/
+sudo -H -u www-data bash -xes <<\EOF
+umask 0077
+openssl rand 30 | base64 -w0 > /var/lib/linaro-abs-frontend/jenkins-password
+EOF
+
 sudo -H -u build-system-frontend bash -xes <<\EOF
 cd
+openssl rand 30 | base64 -w0 > /home/build-system-frontend/jenkins-password
+chmod go-rwx /home/build-system-frontend/jenkins-password
 bzr get lp:~mwhudson/linaro-android/frontend frontend
 cd frontend
 make
@@ -184,15 +195,14 @@ LOGOUT_URL = '/logout'
 DATABASES['default']['NAME'] = '/var/lib/linaro-abs-frontend/session.db'
 
 FRONTEND_JENKINS_USER = 'frontend'
-FRONTEND_JENKINS_PASSWORD = open('/home/build-system-frontend/jenkins-password').read().strip()
+FRONTEND_JENKINS_PASSWORD = open('/var/lib/linaro-abs-frontend/jenkins-password').read().strip()
 
 SECRET_KEY = '$KEY'
 
 EOF2
 EOF
 
-cd ~/build-system-frontend/frontend
-
+cd ~build-system-frontend/frontend
 yes no | sudo -u www-data ./bin/manage syncdb --settings settings_prod
 sudo -u www-data ./bin/manage loaddata --settings settings_prod group-fixture.json