summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-01-27 10:19:34 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-01-30 17:28:00 +0000
commitb05be2068a1009a2d58322fe0aefa1e8d371cc78 (patch)
tree043d0e4eea1ca851d21487a9ea281a4adf1b4aae
parent43721a6d657ae6f527aa59378b1722bbd10127f6 (diff)
downloadinfrastructure-b05be2068a1009a2d58322fe0aefa1e8d371cc78.tar.gz
Move lorry-controller into its own stratum
This allows using it separately from Trove. I want to use it in the gerrit.baserock.org system to handle mirroring from git.baserock.org, at least initially.
-rw-r--r--strata/lorry-controller.morph16
-rw-r--r--strata/trove.morph6
-rw-r--r--systems/trove-system-x86_64.morph2
3 files changed, 18 insertions, 6 deletions
diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph
new file mode 100644
index 00000000..2090787e
--- /dev/null
+++ b/strata/lorry-controller.morph
@@ -0,0 +1,16 @@
+name: lorry-controller
+kind: stratum
+description: |
+ Lorry Controller mirroring service.
+
+ This is a component of Trove, but can
+ also be used with other Git servers.
+build-depends:
+- morph: strata/foundation.morph
+chunks:
+- name: lorry-controller
+ morph: strata/trove/lorry-controller.morph
+ repo: baserock:baserock/lorry-controller
+ ref: 4b1fcab140d940470c342c6857cdc8682406f0b7
+ unpetrify-ref: master
+ build-depends: []
diff --git a/strata/trove.morph b/strata/trove.morph
index 3b5ca528..dd787fec 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -75,12 +75,6 @@ chunks:
ref: 98cf2ab9c80c8efd0df9086353972e7dc73f40b8
unpetrify-ref: master
build-depends: []
-- name: lorry-controller
- morph: strata/trove/lorry-controller.morph
- repo: baserock:baserock/lorry-controller
- ref: 4b1fcab140d940470c342c6857cdc8682406f0b7
- unpetrify-ref: master
- build-depends: []
- name: lua-scrypt
morph: strata/trove/lua-scrypt.morph
repo: upstream:lua-scrypt
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index 0d633f41..8a776bbf 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/pcre-utils.morph
- name: lorry
morph: strata/lorry.morph
+- name: lorry-controller
+ morph: strata/lorry-controller.morph
- name: trove
morph: strata/trove.morph
- name: lighttpd-server