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 /share | |
| 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 'share')
| -rw-r--r-- | share/lorry-controller.conf | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/share/lorry-controller.conf b/share/lorry-controller.conf index 6004171..bdbbbd5 100644 --- a/share/lorry-controller.conf +++ b/share/lorry-controller.conf @@ -1,50 +1,50 @@ [ { - "type": "trove", - "uuid": "##PREFIX##/initial", - "serial": 1, - "trovehost": "git.baserock.org", - "protocol": "ssh", - "ls-interval": "4H", - "interval": "2H", - "create": "always", - "destroy": "never", - "stagger": true, - "prefixmap": { - "baserock": "baserock", - "delta": "delta" - }, - "ignore": [ - "baserock/lorries" - ], - "tarball": "always" + "type": "trove", + "uuid": "##PREFIX##/initial", + "serial": 1, + "trovehost": "##UPSTREAM_TROVE##", + "protocol": "ssh", + "ls-interval": "4H", + "interval": "2H", + "create": "always", + "destroy": "never", + "stagger": true, + "prefixmap": { + "baserock": "baserock", + "delta": "delta" + }, + "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" - ] + "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" + ] }, { - "type": "lorries", - "uuid": "##PREFIX##/closed-source-lorries", - "serial": 1, - "interval": "6H", - "create": "always", - "destroy": "never", - "stagger": true, - "prefix": "delta", - "tarball": "always", - "globs": [ - "closed-source-lorries/*.lorry" - ] + "type": "lorries", + "uuid": "##PREFIX##/closed-source-lorries", + "serial": 1, + "interval": "6H", + "create": "always", + "destroy": "never", + "stagger": true, + "prefix": "delta", + "tarball": "always", + "globs": [ + "closed-source-lorries/*.lorry" + ] } ] |