aboutsummaryrefslogtreecommitdiff
path: root/control
diff options
context:
space:
mode:
authorMichael Hudson <michael.hudson@linaro.org>2011-01-26 16:57:58 +1300
committerMichael Hudson <michael.hudson@linaro.org>2011-01-26 16:57:58 +1300
commit61e416af6c38021419090e650e302a05ffcfbb30 (patch)
tree3dcc72ca40dee43571d48607764e9cabe7233f6e /control
parent5aca0b6bc0a9fb060c3e3000edb818bc8df83de5 (diff)
configure git-daemon so it actually works; do not install/configure apache for now
Diffstat (limited to 'control')
-rwxr-xr-xcontrol/setup-control-node50
1 files changed, 30 insertions, 20 deletions
diff --git a/control/setup-control-node b/control/setup-control-node
index 05d644a..b21a88b 100755
--- a/control/setup-control-node
+++ b/control/setup-control-node
@@ -18,33 +18,35 @@ sudo apt-get update
sudo apt-get install -y git-core gnupg
#
-# +++ HUDSON / APACHE2 +++
+# +++ HUDSON +++
#
wget -q -O - http://pkg.hudson-labs.org/debian/hudson-labs.org.key | sudo apt-key add -
sudo apt-get install -y software-properties-gtk
sudo apt-add-repository 'deb http://pkg.hudson-labs.org/debian binary/' # XXX need to not add deb-src line
sudo apt-get update
-sudo apt-get install -y apache2
sudo apt-get install -y hudson
-# enable mod proxy
-sudo a2enmod proxy
-sudo a2enmod proxy_http
-
-cat << EOF | sudo tee /etc/apache2/conf.d/hudson > /dev/null
-ProxyPass /hudson http://localhost:8081/hudson
-ProxyPassReverse /hudson http://localhost:8081/hudson
-ProxyRequests Off
-
-# Local reverse proxy authorization override
-# Most unix distribution deny proxy by default (ie /etc/apache2/mods-enabled/proxy.conf in Ubuntu)
-<Proxy http://localhost:8081/hudson*>
- Order deny,allow
- Allow from all
-</Proxy>
-EOF
+# +++ APACHE +++
-sudo /etc/init.d/apache2 reload
+# enable mod proxy
+# sudo apt-get install -y apache2
+# sudo a2enmod proxy
+# sudo a2enmod proxy_http
+#
+# cat << EOF | sudo tee /etc/apache2/conf.d/hudson > /dev/null
+# ProxyPass /hudson http://localhost:8081/hudson
+# ProxyPassReverse /hudson http://localhost:8081/hudson
+# ProxyRequests Off
+#
+# # Local reverse proxy authorization override
+# # Most unix distribution deny proxy by default (ie /etc/apache2/mods-enabled/proxy.conf in Ubuntu)
+# <Proxy http://localhost:8081/hudson*>
+# Order deny,allow
+# Allow from all
+# </Proxy>
+# EOF
+#
+# sudo /etc/init.d/apache2 reload
#
@@ -67,10 +69,18 @@ sed -i "s/android.git.kernel.org/${mirror}/" .repo/manifests/default.xml
# +++ git: daemon +++
#
sudo apt-get install -y git-daemon-run
-sudo ln -s /mnt/mirror /var/cache/git/android
#
# +++ gitweb +++
#
sudo apt-get install -y gitweb
+cat <<EOF | sudo tee /etc/sv/git-daemon/run > /dev/null
+#!/bin/sh
+exec 2>&1
+echo 'git-daemon starting.'
+exec chpst -ugitdaemon \
+ "$(git --exec-path)"/git-daemon --verbose --base-path=/mnt/mirror --export-all
+EOF
+
+sudo sv reload git-daemon \ No newline at end of file