From 4d296778c123125f279691993a86160e90fa6097 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 22 Sep 2014 12:56:26 +0000 Subject: Split PCRE out into its own stratum We need PCRE in multiple places, so rather than having multiple definitions, and potentially differing versions, let's use the same one from its own stratum. The need to add the stratum entry into the systems is annoying, and could probably do with a way of specifying that a stratum includes another, rather than just depends on it. Also, it seems a bit weird to have a stratum with only one chunk in it, but I can't think of a better way. --- systems/gitlab-ci-runner.morph | 2 ++ systems/gitlab-server.morph | 2 ++ systems/trove-system-x86_64.morph | 2 ++ systems/web-system-x86_64-generic.morph | 2 ++ 4 files changed, 8 insertions(+) (limited to 'systems') diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 919b3647..9e5fc1de 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -33,6 +33,8 @@ strata: morph: strata/openstack-clients.morph - name: databases morph: strata/databases.morph +- name: pcre + morph: strata/pcre-utils.morph - name: webtools morph: strata/webtools.morph - name: ruby diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph index c78abe1c..e497731d 100644 --- a/systems/gitlab-server.morph +++ b/systems/gitlab-server.morph @@ -17,6 +17,8 @@ strata: morph: strata/nfs.morph - name: databases morph: strata/databases.morph +- name: pcre + morph: strata/pcre-utils.morph - name: webtools morph: strata/webtools.morph - name: ruby diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 297c9fb2..1ffcd676 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -15,6 +15,8 @@ strata: morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph +- name: pcre-utils + morph: strata/pcre-utils.morph - name: trove morph: strata/trove.morph - name: nfs diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index 1e6eba80..c4e61ef6 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -17,6 +17,8 @@ strata: morph: strata/nfs.morph - name: databases morph: strata/databases.morph +- name: pcre + morph: strata/pcre-utils.morph - name: webtools morph: strata/webtools.morph - name: erlang -- cgit v1.2.1 From 26d6519348cf3d178d35f8f0c8a5257cc9b5ba15 Mon Sep 17 00:00:00 2001 From: Richard Maw 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. --- systems/trove-system-x86_64.morph | 2 ++ 1 file changed, 2 insertions(+) (limited to 'systems') 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 From aa82df0fce07508020e43803d570f5f041ab5cac Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 10 Nov 2014 15:54:52 +0000 Subject: Add lighttpd to web system --- systems/web-system-x86_64-generic.morph | 2 ++ 1 file changed, 2 insertions(+) (limited to 'systems') diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index c4e61ef6..12eda4a6 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -19,6 +19,8 @@ strata: morph: strata/databases.morph - name: pcre morph: strata/pcre-utils.morph +- name: lighttpd-server + morph: strata/lighttpd-server.morph - name: webtools morph: strata/webtools.morph - name: erlang -- cgit v1.2.1