From 54d7bc868227201f829ad89d7662babb964e6717 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 27 Jan 2015 10:19:34 +0000
Subject: 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.
---
 strata/lorry-controller.morph                  | 16 ++++++++++++++++
 strata/lorry-controller/lorry-controller.morph | 10 ++++++++++
 strata/trove.morph                             |  6 ------
 strata/trove/lorry-controller.morph            | 10 ----------
 systems/trove-system-x86_64.morph              |  2 ++
 5 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 strata/lorry-controller.morph
 create mode 100644 strata/lorry-controller/lorry-controller.morph
 delete mode 100644 strata/trove/lorry-controller.morph

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/lorry-controller/lorry-controller.morph b/strata/lorry-controller/lorry-controller.morph
new file mode 100644
index 00000000..2f90a9a1
--- /dev/null
+++ b/strata/lorry-controller/lorry-controller.morph
@@ -0,0 +1,10 @@
+name: lorry-controller
+kind: chunk
+build-system: python-distutils
+post-install-commands:
+- install -d 0755 "$DESTDIR/etc/lighttpd"
+- install -m 0644 -D etc/lighttpd/*.conf "$DESTDIR/etc/lighttpd/."
+- |
+  TGT="$DESTDIR/usr/lib/systemd/system"
+  install -d "$TGT/multi-user.target.wants"
+  install -m 0644 units/*.service units/*.timer "$TGT/."
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/strata/trove/lorry-controller.morph b/strata/trove/lorry-controller.morph
deleted file mode 100644
index 2f90a9a1..00000000
--- a/strata/trove/lorry-controller.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: lorry-controller
-kind: chunk
-build-system: python-distutils
-post-install-commands:
-- install -d 0755 "$DESTDIR/etc/lighttpd"
-- install -m 0644 -D etc/lighttpd/*.conf "$DESTDIR/etc/lighttpd/."
-- |
-  TGT="$DESTDIR/usr/lib/systemd/system"
-  install -d "$TGT/multi-user.target.wants"
-  install -m 0644 units/*.service units/*.timer "$TGT/."
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
-- 
cgit v1.2.1