From 26d6519348cf3d178d35f8f0c8a5257cc9b5ba15 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Mon, 22 Sep 2014 13:11:27 +0000
Subject: Move lighttpd out of trove.morph

It would be nice to in-line the lighttpd morphology, but we can't do
that yet.
---
 strata/lighttpd-server.morph          | 13 +++++++++++++
 strata/lighttpd-server/lighttpd.morph |  6 ++++++
 strata/trove.morph                    |  6 ------
 strata/trove/lighttpd.morph           |  6 ------
 systems/trove-system-x86_64.morph     |  2 ++
 5 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 strata/lighttpd-server.morph
 create mode 100644 strata/lighttpd-server/lighttpd.morph
 delete mode 100644 strata/trove/lighttpd.morph

diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.morph
new file mode 100644
index 00000000..cf3dec19
--- /dev/null
+++ b/strata/lighttpd-server.morph
@@ -0,0 +1,13 @@
+name: lighttpd-server
+kind: stratum
+description: lighttpd web server
+build-depends:
+- morph: strata/tools.morph
+- morph: strata/pcre-utils.morph
+chunks:
+- name: lighttpd
+  morph: strata/lighttpd-server/lighttpd.morph
+  repo: upstream:lighttpd
+  ref: 12e4e21763da770034267ff0a7b660876930f789
+  unpetrify-ref: baserock/morph
+  build-depends: []
diff --git a/strata/lighttpd-server/lighttpd.morph b/strata/lighttpd-server/lighttpd.morph
new file mode 100644
index 00000000..ae371c52
--- /dev/null
+++ b/strata/lighttpd-server/lighttpd.morph
@@ -0,0 +1,6 @@
+name: lighttpd
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh
+- ./configure --prefix="$PREFIX" --with-openssl --with-openssl-libs=/usr/lib
diff --git a/strata/trove.morph b/strata/trove.morph
index 63180364..d0773314 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -193,12 +193,6 @@ chunks:
   ref: d7ca3f2f14ad28437f7332ca387a790fecb8b081
   unpetrify-ref: master
   build-depends: []
-- name: lighttpd
-  morph: strata/trove/lighttpd.morph
-  repo: upstream:lighttpd
-  ref: 12e4e21763da770034267ff0a7b660876930f789
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: lua-scrypt
   morph: strata/trove/lua-scrypt.morph
   repo: upstream:lua-scrypt
diff --git a/strata/trove/lighttpd.morph b/strata/trove/lighttpd.morph
deleted file mode 100644
index ae371c52..00000000
--- a/strata/trove/lighttpd.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: lighttpd
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --with-openssl --with-openssl-libs=/usr/lib
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index 1ffcd676..d603f531 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: trove
   morph: strata/trove.morph
+- name: lighttpd-server
+  morph: strata/lighttpd-server.morph
 - name: nfs
   morph: strata/nfs.morph
 - name: ansible
-- 
cgit v1.2.1