From d4b09fc6a4b870a1a22d5a259e9b51d71386d434 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Wed, 24 Oct 2012 10:09:03 +0100 Subject: Update default lorry controller config and add a README. All untested --- bins/trove-early-setup | 3 ++- share/README.lorry-controller | 18 ++++++++++++++++++ share/lorry-controller.conf | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 share/README.lorry-controller diff --git a/bins/trove-early-setup b/bins/trove-early-setup index 4aad517..bf8733d 100755 --- a/bins/trove-early-setup +++ b/bins/trove-early-setup @@ -74,7 +74,8 @@ lorry-controller-configured: /home/lorry/.lorry-controller-setup 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 "cd /tmp/lorries; git add lorry-controller.conf; git commit -m 'Initial configuration'; git push origin master" - 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 "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/README.lorry-controller b/share/README.lorry-controller new file mode 100644 index 0000000..1c70617 --- /dev/null +++ b/share/README.lorry-controller @@ -0,0 +1,18 @@ +Source code acquisition +======================= + +This repository controls the source code acquisition service known as Lorry. + +When it was created, there were two stanzas in the controller configuration +file. One which retrieved open source Baserock into your Trove and one which +allows you to create individual Lorry configurations for other open source +code. + +Please refer to the Trove Reference Manual chapters on the source code +acquisition service (Lorry) and the Developing With Baserock document's +scenarios regarding adding external software to your Trove before attempting to +add any additional configuration to this repository. + +Remember, the Lorry tool is not permitted to manage repositories inside your +prefix which is ##PREFIX##. + diff --git a/share/lorry-controller.conf b/share/lorry-controller.conf index b6f5838..fb7a94c 100644 --- a/share/lorry-controller.conf +++ b/share/lorry-controller.conf @@ -15,6 +15,21 @@ }, "ignore": [ "baserock/lorries" + ], + "tarball": "always" + }, + { + "type": "lorries", + "uuid": "##PREFIX##/open-source-lorries", + "serial": 1, + "interval": "6H", + "create": "always", + "destroy": "never", + "stagger": true, + "prefix": "delta", + "tarball": "always", + "globs": [ + "open-source-lorries/*.lorry" ] } ] -- cgit v1.2.1