diff options
| author | Richard Maw <richard.maw@gmail.com> | 2014-11-12 11:02:32 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@gmail.com> | 2014-11-12 11:02:32 +0000 |
| commit | 3383b4c8bfe99b296ca57d9a890f5e7ef5622cdf (patch) | |
| tree | b3f01e7a895de726c5f8413864e831fdf4d1bc56 /systems | |
| parent | c42e94f0a7dddf3df2dd14d6fb3283b81ee62d5d (diff) | |
| parent | aa82df0fce07508020e43803d570f5f041ab5cac (diff) | |
| download | definitions-3383b4c8bfe99b296ca57d9a890f5e7ef5622cdf.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richardmaw/split-out-lighttpd'
Reviewed-by: Adam Coldrick
Reviewed-by: Tom Pollard
Reviewed-by: Pedro Alvarez
Diffstat (limited to 'systems')
| -rw-r--r-- | systems/gitlab-ci-runner.morph | 2 | ||||
| -rw-r--r-- | systems/gitlab-server.morph | 2 | ||||
| -rw-r--r-- | systems/trove-system-x86_64.morph | 4 | ||||
| -rw-r--r-- | systems/web-system-x86_64-generic.morph | 4 |
4 files changed, 12 insertions, 0 deletions
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 919b3647..f7398793 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-utils + 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..a9c9bbd3 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-utils + 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..d603f531 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -15,8 +15,12 @@ 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: lighttpd-server + morph: strata/lighttpd-server.morph - name: nfs morph: strata/nfs.morph - name: ansible diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph index 1e6eba80..e916cffc 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system-x86_64-generic.morph @@ -17,6 +17,10 @@ strata: morph: strata/nfs.morph - name: databases morph: strata/databases.morph +- name: pcre-utils + morph: strata/pcre-utils.morph +- name: lighttpd-server + morph: strata/lighttpd-server.morph - name: webtools morph: strata/webtools.morph - name: erlang |