diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-02 16:55:12 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-02 16:55:12 +0000 |
commit | 437c7008a34ff594df9f1bb518ae588e19e80c17 (patch) | |
tree | 7c59b8ff81a1682acc6fa997625a623889308726 | |
parent | 1a0bb1979fa5863c2c19bcf2ab62449a1fa96277 (diff) | |
parent | 54d7bc868227201f829ad89d7662babb964e6717 (diff) | |
download | definitions-437c7008a34ff594df9f1bb518ae588e19e80c17.tar.gz |
Merge branch 'baserock/sam/lorry-controller-stratum'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r-- | strata/lorry-controller.morph | 16 | ||||
-rw-r--r-- | strata/lorry-controller/lorry-controller.morph (renamed from strata/trove/lorry-controller.morph) | 0 | ||||
-rw-r--r-- | strata/trove.morph | 6 | ||||
-rw-r--r-- | systems/trove-system-x86_64.morph | 2 |
4 files changed, 18 insertions, 6 deletions
diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph new file mode 100644 index 00000000..38d90471 --- /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/python-core.morph +chunks: +- name: lorry-controller + morph: strata/lorry-controller/lorry-controller.morph + repo: baserock:baserock/lorry-controller + ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd + unpetrify-ref: master + build-depends: [] diff --git a/strata/trove/lorry-controller.morph b/strata/lorry-controller/lorry-controller.morph index 2f90a9a1..2f90a9a1 100644 --- a/strata/trove/lorry-controller.morph +++ b/strata/lorry-controller/lorry-controller.morph diff --git a/strata/trove.morph b/strata/trove.morph index fcd34636..665f7d9a 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -76,12 +76,6 @@ chunks: ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 unpetrify-ref: master build-depends: [] -- name: lorry-controller - morph: strata/trove/lorry-controller.morph - repo: baserock:baserock/lorry-controller - ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd - 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 93710a51..1a120ef9 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -21,6 +21,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 |