diff options
Diffstat (limited to 'trove')
-rw-r--r-- | trove/strata/fail2ban-common.morph | 9 | ||||
-rw-r--r-- | trove/strata/lorry-controller.morph | 8 | ||||
-rw-r--r-- | trove/strata/python3-core.morph | 8 | ||||
-rw-r--r-- | trove/strata/trove.morph | 10 | ||||
-rw-r--r-- | trove/systems/trove-system-x86_64.morph | 225 |
5 files changed, 201 insertions, 59 deletions
diff --git a/trove/strata/fail2ban-common.morph b/trove/strata/fail2ban-common.morph index 23918a66..1748adde 100644 --- a/trove/strata/fail2ban-common.morph +++ b/trove/strata/fail2ban-common.morph @@ -1,14 +1,13 @@ name: fail2ban-common -kind: stratum +kind: assemblage description: | This stratum only installs fail2ban. You will need to configure it afterwards. It's recommended to include iptables in the system too. -build-depends: -- morph: strata/core.morph -chunks: +contents: - name: fail2ban morph: trove/strata/fail2ban-common/fail2ban.morph repo: upstream:fail2ban ref: 70ba5cb0054f0869930b8cd2dc1bb836653dd289 - unpetrify-ref: "0.9.3" + unpetrify-ref: 0.9.3 +configuration-extensions: [] diff --git a/trove/strata/lorry-controller.morph b/trove/strata/lorry-controller.morph index 87d3ed00..2c76a31f 100644 --- a/trove/strata/lorry-controller.morph +++ b/trove/strata/lorry-controller.morph @@ -1,16 +1,14 @@ name: lorry-controller -kind: stratum +kind: assemblage 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-cliapp.morph -- morph: strata/python-wsgi.morph -chunks: +contents: - name: lorry-controller morph: trove/strata/lorry-controller/lorry-controller.morph repo: baserock:baserock/lorry-controller ref: dddd2e37953d795e4004b1d2722c25ec652135ad unpetrify-ref: master +configuration-extensions: [] diff --git a/trove/strata/python3-core.morph b/trove/strata/python3-core.morph index afacc3da..3c98dcf4 100644 --- a/trove/strata/python3-core.morph +++ b/trove/strata/python3-core.morph @@ -1,14 +1,11 @@ name: python3-core -kind: stratum +kind: assemblage description: | Some "core" Python packages, for Python 3. The CPython interpreter for Python 3 is in core.morph. -build-depends: -- morph: strata/core.morph - -chunks: +contents: - name: mako repo: upstream:python-packages/mako.git ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7 @@ -56,3 +53,4 @@ chunks: ref: 35b60f390098d3306c03eee27ceec8cf8a493579 unpetrify-ref: v2.3.0 build-system: python3-distutils +configuration-extensions: [] diff --git a/trove/strata/trove.morph b/trove/strata/trove.morph index 8306c630..93a2dd6e 100644 --- a/trove/strata/trove.morph +++ b/trove/strata/trove.morph @@ -1,12 +1,7 @@ name: trove -kind: stratum +kind: assemblage description: Trove software -build-depends: -- morph: strata/python2-core.morph -- morph: strata/tools.morph -- morph: strata/morph-utils.morph -- morph: strata/pcre-utils.morph -chunks: +contents: - name: lua morph: trove/strata/trove/lua.morph repo: upstream:lua @@ -99,3 +94,4 @@ chunks: unpetrify-ref: baserock/morph build-depends: - lua +configuration-extensions: [] diff --git a/trove/systems/trove-system-x86_64.morph b/trove/systems/trove-system-x86_64.morph index fa691d62..50407ae0 100644 --- a/trove/systems/trove-system-x86_64.morph +++ b/trove/systems/trove-system-x86_64.morph @@ -1,65 +1,216 @@ name: trove-system-x86_64 -kind: system +kind: assemblage description: Trove server -arch: x86_64 -strata: +configuration-extensions: +- extensions/set-hostname +- extensions/trove +- extensions/nfsboot-server +- extensions/fstab +- extensions/install-files +- extensions/cloud-init +- extensions/install-essential-files +contents: - name: build-essential morph: strata/build-essential.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: foundation - morph: strata/foundation.morph + build-depends: [] - name: core morph: strata/core.morph + build-depends: + - build-essential - name: python2-core morph: strata/python2-core.morph + build-depends: + - build-essential + - core - name: python3-core morph: trove/strata/python3-core.morph + build-depends: + - build-essential + - core - name: tools morph: strata/tools.morph + build-depends: + - build-essential + - core +- name: pcre-utils + morph: strata/pcre-utils.morph + build-depends: + - build-essential + - core +- name: fail2ban-common + morph: trove/strata/fail2ban-common.morph + build-depends: + - build-essential + - core +- include-mode: build-time + build-depends: + - build-essential + - core + name: coreutils-common + morph: strata/coreutils-common.morph +- name: foundation + morph: strata/foundation.morph + build-depends: + - build-essential + - core + - coreutils-common - name: python-cliapp morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph + build-depends: + - build-essential + - core + - python2-core - name: python-wsgi morph: strata/python-wsgi.morph -- name: libsoup-common - morph: strata/libsoup-common.morph + build-depends: + - build-essential + - core + - python2-core +- name: python-common + morph: strata/python-common.morph + build-depends: + - build-essential + - core + - python2-core +- include-mode: build-time + build-depends: + - build-essential + - core + - python2-core + name: docutils + morph: strata/docutils.morph +- name: bsp-x86_64-generic + morph: strata/bsp-x86_64-generic.morph + build-depends: + - build-essential + - core + - docutils + - python2-core - name: glib-common morph: strata/glib-common.morph -- name: pcre-utils - morph: strata/pcre-utils.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: lorry - morph: strata/lorry.morph -- name: lorry-controller - morph: trove/strata/lorry-controller.morph -- name: trove - morph: trove/strata/trove.morph + build-depends: + - build-essential + - core + - pcre-utils + - python2-core - name: lighttpd-server morph: strata/lighttpd-server.morph + build-depends: + - build-essential + - core + - pcre-utils + - tools - name: nfs morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph + build-depends: + - build-essential + - core + - coreutils-common + - foundation - name: ansible morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph + build-depends: + - build-essential + - core + - python-common + - python2-core - name: devtools morph: strata/devtools.morph -- name: fail2ban-common - morph: trove/strata/fail2ban-common.morph + build-depends: + - build-essential + - core + - docutils + - python2-core - name: connectivity morph: strata/connectivity.morph -configuration-extensions: -- extensions/set-hostname -- extensions/trove -- extensions/nfsboot-server -- extensions/fstab -- extensions/install-files -- extensions/cloud-init -- extensions/install-essential-files + build-depends: + - build-essential + - core + - coreutils-common + - foundation +- name: python-pygobject + morph: strata/python-pygobject.morph + build-depends: + - build-essential + - core + - glib-common + - pcre-utils + - python2-core +- name: libsoup-common + morph: strata/libsoup-common.morph + build-depends: + - build-essential + - core + - glib-common + - pcre-utils + - python2-core +- name: lorry-controller + morph: trove/strata/lorry-controller.morph + build-depends: + - build-essential + - core + - python-cliapp + - python-wsgi + - python2-core +- name: cloudinit-support + morph: strata/cloudinit-support.morph + build-depends: + - build-essential + - core + - coreutils-common + - foundation + - python-common + - python2-core +- name: lorry + morph: strata/lorry.morph + build-depends: + - build-essential + - core + - coreutils-common + - foundation + - pcre-utils + - python-cliapp + - python2-core +- name: ostree-core + morph: strata/ostree-core.morph + build-depends: + - build-essential + - core + - coreutils-common + - foundation + - glib-common + - libsoup-common + - pcre-utils + - python2-core +- name: morph-utils + morph: strata/morph-utils.morph + build-depends: + - build-essential + - core + - coreutils-common + - foundation + - glib-common + - libsoup-common + - ostree-core + - pcre-utils + - python-cliapp + - python-pygobject + - python-wsgi + - python2-core +- name: trove + morph: trove/strata/trove.morph + build-depends: + - build-essential + - core + - coreutils-common + - foundation + - glib-common + - libsoup-common + - morph-utils + - ostree-core + - pcre-utils + - python-cliapp + - python-pygobject + - python-wsgi + - python2-core + - tools |