diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-06-04 14:58:02 +0100 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-06-04 15:17:40 +0100 |
| commit | 3cc863ca9e264bd5439d8f9bfd6dcc6a8b628161 (patch) | |
| tree | d202f9abb1bde3be9cbe8331968169b33b8dd62b | |
| parent | 4f6fbbb22d6f769694250b904985c6196067d7de (diff) | |
| download | trove-setup-3cc863ca9e264bd5439d8f9bfd6dcc6a8b628161.tar.gz | |
Add *-source-lorries directories to the default lorries repo
| -rwxr-xr-x | bins/trove-early-setup | 6 | ||||
| -rw-r--r-- | share/closed-source-lorries/README | 1 | ||||
| -rw-r--r-- | share/lorry-controller.conf | 3 | ||||
| -rw-r--r-- | share/open-source-lorries/README | 1 |
4 files changed, 9 insertions, 2 deletions
diff --git a/bins/trove-early-setup b/bins/trove-early-setup index f1edcea..488e738 100755 --- a/bins/trove-early-setup +++ b/bins/trove-early-setup @@ -74,7 +74,11 @@ gitano-configured: /home/git/.gitano-setup 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 "cd /tmp/lorries; git add README lorry-controller.conf; git commit -m 'Initial configuration'; git push origin master" - git + su -c "mkdir /tmp/lorries/open-source-lorries" - git + su -c "cp /usr/share/trove-setup/open-source-lorries/README /tmp/lorries/open-source-lorries/README" - git + su -c "mkdir /tmp/lorries/closed-source-lorries" - git + 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 diff --git a/share/closed-source-lorries/README b/share/closed-source-lorries/README new file mode 100644 index 0000000..8b422be --- /dev/null +++ b/share/closed-source-lorries/README @@ -0,0 +1 @@ +Lorries of code that is closed-source should go here diff --git a/share/lorry-controller.conf b/share/lorry-controller.conf index fb7a94c..fecf2ca 100644 --- a/share/lorry-controller.conf +++ b/share/lorry-controller.conf @@ -29,7 +29,8 @@ "prefix": "delta", "tarball": "always", "globs": [ - "open-source-lorries/*.lorry" + "open-source-lorries/*.lorry", + "closed-source-lorries/*.lorry" ] } ] diff --git a/share/open-source-lorries/README b/share/open-source-lorries/README new file mode 100644 index 0000000..1394520 --- /dev/null +++ b/share/open-source-lorries/README @@ -0,0 +1 @@ +Lorries of code that is open-source should go here |