diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-04-23 16:40:44 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-04-23 16:40:44 +0000 |
| commit | eafba37e2bfc3897e3e7f65f2ce087fbee358f43 (patch) | |
| tree | 7acd5c8fea2ad7a00ba393799f0a155417edf07d /bins/trove-early-setup | |
| parent | 56b4fc537662d8d42f366b5cb5be0eada79d8d56 (diff) | |
| parent | 88051a6ab096b20ab098434fd4d4c127efca910f (diff) | |
| download | trove-setup-eafba37e2bfc3897e3e7f65f2ce087fbee358f43.tar.gz | |
Merge branch 'baserock/liw/new-lc-2'
Reviewed by Daniel and Richard on the mailing list, and further
changes based on review feedback by Richard on IRC.
Reviewed-by: Richard Maw
Reviewed-by: Daniel Silverstone
Diffstat (limited to 'bins/trove-early-setup')
| -rwxr-xr-x | bins/trove-early-setup | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bins/trove-early-setup b/bins/trove-early-setup index 308a3e7..5ce2d7a 100755 --- a/bins/trove-early-setup +++ b/bins/trove-early-setup @@ -69,8 +69,6 @@ gitano-configured: /home/git/.gitano-setup PREFIX=$$(echo "##PREFIX##" | sed -f /etc/trove-setup.sed); \ su -c "ssh localhost create $${PREFIX}/local-config/lorries" - git; \ su -c "git clone ssh://localhost/$${PREFIX}/local-config/lorries.git /tmp/lorries" - git; \ - su -c "mkdir /home/lorry/lorry-controller-area" - lorry; \ - su -c "git clone ssh://git@localhost/$${PREFIX}/local-config/lorries.git /home/lorry/lorry-controller-area/git" - lorry su -c "sed -f /etc/trove-setup.sed < /usr/share/trove-setup/lorry-controller.conf > /tmp/lorries/lorry-controller.conf" - git su -c "sed -f /etc/trove-setup.sed < /usr/share/trove-setup/README.lorry-controller > /tmp/lorries/README" - git su -c "mkdir /tmp/lorries/open-source-lorries" - git @@ -79,8 +77,6 @@ gitano-configured: /home/git/.gitano-setup su -c "cp /usr/share/trove-setup/closed-source-lorries/README /tmp/lorries/closed-source-lorries/README" - git su -c "cd /tmp/lorries; git add README lorry-controller.conf open-source-lorries/README closed-source-lorries/README; git commit -m 'Initial configuration'; git push origin master" - git su -c "rm -rf /tmp/lorries" - git - su -c "cd /home/lorry/lorry-controller-area/git; git remote update; git checkout master" - lorry - su -c "echo '*/1 * * * * flock -x -n /home/lorry/lorry-controller-area/lockfile -c lorry-controller --work-area=/home/lorry/lorry-controller-area --log=syslog --log-level=info --html-file=/home/lorry/lc-status.html' | crontab -" - lorry touch $@ .PHONY: lorry-configured |