summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-09-22 13:11:27 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-11-10 15:55:25 +0000
commit26d6519348cf3d178d35f8f0c8a5257cc9b5ba15 (patch)
treef4a32c83988005f04c2b20af43c5097404fe4da3
parent4d296778c123125f279691993a86160e90fa6097 (diff)
downloaddefinitions-26d6519348cf3d178d35f8f0c8a5257cc9b5ba15.tar.gz
Move lighttpd out of trove.morph
It would be nice to in-line the lighttpd morphology, but we can't do that yet.
-rw-r--r--strata/lighttpd-server.morph13
-rw-r--r--strata/lighttpd-server/lighttpd.morph (renamed from strata/trove/lighttpd.morph)0
-rw-r--r--strata/trove.morph6
-rw-r--r--systems/trove-system-x86_64.morph2
4 files changed, 15 insertions, 6 deletions
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/trove/lighttpd.morph b/strata/lighttpd-server/lighttpd.morph
index ae371c52..ae371c52 100644
--- a/strata/trove/lighttpd.morph
+++ b/strata/lighttpd-server/lighttpd.morph
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/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