diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-13 10:21:40 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-13 10:21:40 +0000 |
| commit | a2c5cf39071b52b78dc50879f941f25470c32337 (patch) | |
| tree | 26e5c781a2c7c8562948f16e4cfa1928047bb9cb | |
| parent | b38661d6be2eafd42c43598505f8d3661a9e73fb (diff) | |
| parent | 9a9fdb3d88756177c7b0382e5ebe8e1e4ecb7815 (diff) | |
| download | trove-setup-a2c5cf39071b52b78dc50879f941f25470c32337.tar.gz | |
Merge branch 'baserock/richardmaw/default-mason-hosts' of ssh://roadtrain.codethink.co.uk/codethink/trove-setup
| -rwxr-xr-x | bins/trove-early-setup | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bins/trove-early-setup b/bins/trove-early-setup index 82aec11..f1edcea 100755 --- a/bins/trove-early-setup +++ b/bins/trove-early-setup @@ -96,8 +96,9 @@ cache-configured: /home/cache/.cache-setup PREFIX=$$(echo "##PREFIX##" | sed -f /etc/trove-setup.sed); \ su -c "ssh localhost create $${PREFIX}/local-config/mason" - git; \ su -c "git clone ssh://localhost/$${PREFIX}/local-config/mason.git /tmp/mason-config" - git - su -c "cd /tmp/mason-config; mkdir ci1; (echo '[';echo ']') > ci1/systems.json.txt" - git - su -c "cd /tmp/mason-config; (echo '['; echo ']') > ci1/hosts.json.txt" - git + su -c "mkdir /tmp/mason-config/ci1" - git + su -c "cp /var/lib/trove-setup/hosts.json.txt /tmp/mason-config/ci1" - git + su -c "cp /var/lib/trove-setup/systems.json.txt /tmp/mason-config/ci1" - git su -c "cd /tmp/mason-config; git add ci1; git commit -m 'Set initial Mason config'; git push origin master" - git su -c "rm -fr /tmp/mason-config" - git su -c 'mkdir /home/mason/jobs' - mason |