diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 159cbefc3..7c702806f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.42.2 +current_version = 2.0.0 commit = True tag = False tag_name = {new_version} @@ -30,17 +30,17 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2023-12-08T18:02:01Z +search = {current_version} 2023-12-11T14:46:41Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-12-08T18:02:01Z +values = 2023-12-11T14:46:41Z -[bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] +[bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' replace = 'version': '{new_version}' -[bumpversion:file(releaseTime):birdhouse/config/canarie-api/docker_configuration.py.template] +[bumpversion:file(releaseTime):birdhouse/components/canarie-api/docker_configuration.py.template] parse = 'releaseTime': '(?P.*)' serialize = {releaseTime} replace = {utcnow:%Y-%m-%dT%H:%M:%SZ} diff --git a/CHANGES.md b/CHANGES.md index 44e423220..7c887c498 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,29 @@ [//]: # (list changes here, using '-' for each new entry, remove this when items are added) +[2.0.0](https://github.com/bird-house/birdhouse-deploy/tree/2.0.0) (2023-12-11) +------------------------------------------------------------------------------------------------------------------ + +## Changes + +- Update `DEFAULT_CONF_DIRS` to the minimal components required to deploy the stack + + Changes `DEFAULT_CONF_DIRS` to refer exclusively to the proxy, magpie, twitcher, stac, and cowbird components. + Also moves all components that were previously under the `birdhouse/config` directory to the `birdhouse/components` + directory. This removes the arbitrary distinction between these groups of components that didn't have any functional + or logical reason. + + Because this change updates the default components, this is not backwards compatible unless the following changes are + made to the local environment file (`birdhouse/env.local` by default): + + - add any components no longer in the `DEFAULT_CONF_DIRS` list to the `EXTRA_CONF_DIRS` list. + For example, to keep the jupyterhub component enabled, add `./components/jupyterhub` to the `EXTRA_CONF_DIRS` list. + + - update the `PROXY_ROOT_LOCATION` to redirect the root path `/` to an enabled component. By default, this will + redirect to Magpie's landing page, unless jupyterhub is enabled, in which case it will redirect to jupyterhub's + landing page. + If any other behaviour is desired, `PROXY_ROOT_LOCATION` should be updated in the `env.local` file. + [1.42.2](https://github.com/bird-house/birdhouse-deploy/tree/1.42.2) (2023-12-08) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index 1ec145699..21e7da382 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.42.2 +override APP_VERSION := 2.0.0 # utility to remove comments after value of an option variable override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g") diff --git a/README.rst b/README.rst index c1c8b827f..f978d558d 100644 --- a/README.rst +++ b/README.rst @@ -14,13 +14,13 @@ for a full-fledged production platform. * - releases - | |latest-version| |commits-since| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.42.2.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.0.0.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.42.2...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.0.0...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.42.2-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.0.0-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.42.2 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.0.0 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) diff --git a/RELEASE.txt b/RELEASE.txt index 0399b4f80..2433f8ca1 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.42.2 2023-12-08T18:02:01Z +2.0.0 2023-12-11T14:46:41Z diff --git a/birdhouse/.gitignore b/birdhouse/.gitignore new file mode 100644 index 000000000..f6a2dff5c --- /dev/null +++ b/birdhouse/.gitignore @@ -0,0 +1 @@ +./config diff --git a/birdhouse/README.rst b/birdhouse/README.rst index e3e3c57c5..3d9f8557a 100644 --- a/birdhouse/README.rst +++ b/birdhouse/README.rst @@ -118,7 +118,7 @@ Note ---- * All WPS requests should be completed within ``proxy_read_timeout`` of the - Nginx proxy, see `nginx.conf`_ (:download:`download `). + Nginx proxy, see `nginx.conf`_ (:download:`download `). Any WPS requests that will take longer should use the async mode. Default value ``PROXY_READ_TIMEOUT_VALUE`` in `default.env`_ (:download:`download `). @@ -378,7 +378,7 @@ Release Procedure * Run ``git push --tags`` to upload the new version. -.. _nginx.conf: ./config/proxy/nginx.conf +.. _nginx.conf: ./components/proxy/nginx.conf .. _default.env: ./default.env .. _`.bumpversion.cfg`: ../.bumpversion.cfg .. _CHANGES.md: ../CHANGES.md diff --git a/birdhouse/components/README.rst b/birdhouse/components/README.rst index 82d13dfd9..80f25bf73 100644 --- a/birdhouse/components/README.rst +++ b/birdhouse/components/README.rst @@ -556,4 +556,266 @@ How to Enable the Component --------------------------- - Edit ``env.local`` (a copy of `env.local.example`_) -- Add ``./optional-components/stac`` to ``EXTRA_CONF_DIRS``. +- Add ``./components/stac`` to ``EXTRA_CONF_DIRS``. + +Canarie-API +=========== + +An endpoint monitoring tool that shows the current status of other components in the software stack. + +Usage +----- + +The service is available at ``https://${PAVICS_FQDN_PUBLIC}/canarie`` + +How to Enable the Component +--------------------------- + +- Edit ``env.local`` (a copy of `env.local.example`_) +- Add ``./components/canarie`` to ``EXTRA_CONF_DIRS``. + +data-volume +=========== + +Creates a named volume in docker that is shared between WPS and OGCAPI components. This volume will contain data shared +and used by these services. + +Usage +----- + +This component is transparent to the end-user as its role is to share data between other components in the stack. + +How to Enable the Component +--------------------------- + +- Do not enable this component directly. It will be enabled as a dependency of other components + +Finch +===== +Users of climate data are interested in specific indices such as the number of freeze-thaw cycles, the number of +degree-days of cooling, the duration of heatwaves, etc. This returns annual values of the most popular climate indices. + +Usage +----- + +The service is available at ``https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/finch`` + +How to Enable the Component +--------------------------- + +- Edit ``env.local`` (a copy of `env.local.example`_) +- Add ``./components/finch`` to ``EXTRA_CONF_DIRS``. + +Geoserver +========= + +GeoServer is the reference implementation of the Open Geospatial Consortium (OGC) Web Feature Service (WFS) and Web +Coverage Service (WCS) standards, as well as a high performance certified compliant Web Map Service (WMS), compliant +Catalog Service for the Web (CSW) and implementing Web Processing Service (WPS). GeoServer forms a core component of the +Geospatial Web. + +Usage +----- + +The service is available at ``https://${PAVICS_FQDN_PUBLIC}/geoserver``. For usage and +configuration options please refer to the `Geoserver documentation`_. + +.. _Geoserver documentation: https://docs.geoserver.org + +How to Enable the Component +--------------------------- + +- Edit ``env.local`` (a copy of `env.local.example`_) +- Add ``./components/geoserver`` to ``EXTRA_CONF_DIRS``. + +Hummingbird +=========== + +A Web Processing Service for compliance checks used in the climate science community. + +Usage +----- + +The service is available at ``https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/hummingbird`` + +How to Enable the Component +--------------------------- + +- Edit ``env.local`` (a copy of `env.local.example`_) +- Add ``./components/hummingbird`` to ``EXTRA_CONF_DIRS``. + +Jupyterhub +========== + +Portal used to launch and manage jupyterlab servers for users. This provides a managed development environment for +end-users. + +Usage +----- + +The service is available at ``https://${PAVICS_FQDN_PUBLIC}/jupyter``. Users are able to log in to Jupyterhub using the +same user name and password as Magpie. They will then be able to launch a personal jupyterlab server. + +How to Enable the Component +--------------------------- + +- Edit ``env.local`` (a copy of `env.local.example`_) +- Add ``./components/jupyterhub`` to ``EXTRA_CONF_DIRS``. +- Set the ``JUPYTERHUB_CRYPT_KEY`` environment variable + +Magpie +====== + +Magpie is service for AuthN/AuthZ accessible via a REST API. It allows you to manage +User/Group/Service/Resource/Permission management and integrates with Twitcher. + +Usage +----- + +The service is available at ``https://${PAVICS_FQDN_PUBLIC}/magpie``. For usage and configuration options please +refer to the `Magpie documentation`_. + +.. _Magpie documentation: https://pavics-magpie.readthedocs.io + +How to Enable the Component +--------------------------- + +- This component is enabled by default as it is required to securely run the stack + +mongodb +======= + +A NoSQL database used by various other components in the stack as a database backend. + +Usage +----- + +This component is directly visible to the end-user. It is used by other components in the stack. + +How to Enable the Component +--------------------------- + +- Do not enable this component directly. It will be enabled as a dependency of other components. + +portainer +========= + +A web based container deployment and management tool. + +Usage +----- + +The service is available at ``https://${PAVICS_FQDN_PUBLIC}/portainer/``. For usage and configuration options please +refer to the `portainer documentation`_. + +How to Enable the Component +--------------------------- + +- Edit ``env.local`` (a copy of `env.local.example`_) +- Add ``./components/portainer`` to ``EXTRA_CONF_DIRS``. + +.. _portainer documentation: https://docs.portainer.io/ + + +postgres +======== + +A relational database used by various other components in the stack as a database backend. + +Usage +----- + +This component is directly visible to the end-user. It is used by other components in the stack. + +How to Enable the Component +--------------------------- + +- Do not enable this component directly. It will be enabled as a dependency of other components + +Proxy +===== + +An nginx reverse proxy that serves all other components in the stack through a single proxy endpoint. + +Usage +----- + +This component is transparent to the end-user as its role is to serve data from other components in the software stack. + +How to Enable the Component +--------------------------- + +- This component is enabled by default + +Raven +===== + +A suite of WPS processes to calibrate and run hydrological models, including geographical information retrieval and +processing as well as time series analysis. + +Usage +----- + +The service is available at ``https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/raven`` + +How to Enable the Component +--------------------------- + +- Edit ``env.local`` (a copy of `env.local.example`_) +- Add ``./components/raven`` to ``EXTRA_CONF_DIRS``. + +Thredds +======= + +Climate Data Catalog and Format Renderers. See the `Thredds documentation`_ for details. + +.. _Thredds documentation: https://www.unidata.ucar.edu/software/tds/ + +Usage +----- + +The catalog is available at the ``https://${PAVICS_FQDN_PUBLIC}/thredds`` endpoint. + +How to Enable the Component +--------------------------- + +- Edit ``env.local`` (a copy of `env.local.example`_) +- Add ``./components/thredds`` to ``EXTRA_CONF_DIRS``. + +Twitcher +======== + +Twitcher is a security proxy that provides secure access to other components in the stack. The proxy service uses OAuth2 +access tokens to protect the OWS service access using Magpie permissions. + +Usage +----- + +Twitcher should always be used in conjunction with Magpie and should work already without any additional configuration. +For details please refer to the `twitcher documentation`_. + +.. _twitcher documentation: https://twitcher.readthedocs.io/en/latest/ + +How to Enable the Component +--------------------------- + +- This component is enabled by default as it is required to securely run the stack + +wps_outputs-volume +================== + +Creates a named volume in docker that is shared between WPS and OGCAPI components. This volume will contain the outputs +of all processes executed by these services. + +Usage +----- + +All outputs from these processes will become available at the ``https://${PAVICS_FQDN_PUBLIC}/wpsoutputs`` endpoint. + +By default, this endpoint is not protected. To secure access to this endpoint it is highly recommended to enable the +`./optional-components/secure-data-proxy` component as well. + +How to Enable the Component +--------------------------- + +- Do not enable this component directly. It will be enabled as a dependency of other components diff --git a/birdhouse/config/canarie-api/.gitignore b/birdhouse/components/canarie-api/.gitignore similarity index 100% rename from birdhouse/config/canarie-api/.gitignore rename to birdhouse/components/canarie-api/.gitignore diff --git a/birdhouse/config/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template b/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template similarity index 100% rename from birdhouse/config/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template rename to birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template diff --git a/birdhouse/components/canarie-api/config/proxy/docker-compose-extra.yml b/birdhouse/components/canarie-api/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..40338709d --- /dev/null +++ b/birdhouse/components/canarie-api/config/proxy/docker-compose-extra.yml @@ -0,0 +1,11 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/canarie-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/canarie-api:ro + - ./components/canarie-api/docker_configuration.py:/config/docker_configuration.py + - ./components/canarie-api/entrypoint:/entrypoint:ro + environment: + CANARIE_API_CONFIG_FN: /config/docker_configuration.py + CANARIE_MONITORING_EXTRA_CONF_DIR: ${CANARIE_MONITORING_EXTRA_CONF_DIR} + entrypoint: /entrypoint diff --git a/birdhouse/config/canarie-api/default.env b/birdhouse/components/canarie-api/default.env similarity index 92% rename from birdhouse/config/canarie-api/default.env rename to birdhouse/components/canarie-api/default.env index 938286617..6f40700cd 100644 --- a/birdhouse/config/canarie-api/default.env +++ b/birdhouse/components/canarie-api/default.env @@ -5,5 +5,5 @@ export PROXY_IMAGE="pavics/canarieapi:0.7.1" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/proxy + ./components/proxy " diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template similarity index 98% rename from birdhouse/config/canarie-api/docker_configuration.py.template rename to birdhouse/components/canarie-api/docker_configuration.py.template index 5313d0240..473e8bdcc 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -109,8 +109,8 @@ SERVICES = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '1.42.2', - 'releaseTime': '2023-12-08T18:02:01Z', + 'version': '2.0.0', + 'releaseTime': '2023-12-11T14:46:41Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', @@ -142,8 +142,8 @@ PLATFORMS = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '1.42.2', - 'releaseTime': '2023-12-08T18:02:01Z', + 'version': '2.0.0', + 'releaseTime': '2023-12-11T14:46:41Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/birdhouse/config/canarie-api/entrypoint b/birdhouse/components/canarie-api/entrypoint similarity index 100% rename from birdhouse/config/canarie-api/entrypoint rename to birdhouse/components/canarie-api/entrypoint diff --git a/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml index b81c0f0d2..9c3c178f5 100644 --- a/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml @@ -4,7 +4,7 @@ services: proxy: volumes: # NOTE: - # Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/config/canarie-api/docker_configuration.py' + # Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/components/canarie-api/docker_configuration.py' # This ensures that the alphabetical loading order it defines will first load the default configs, then will load # the Cowbird config, and then all python configuration within 'optional-components/canarie-api-full-monitoring'. # It is important to load Cowbird before, as the full monitoring need to know if 'Cowbird' service is added to the diff --git a/birdhouse/components/cowbird/config/magpie/docker-compose-extra.yml b/birdhouse/components/cowbird/config/magpie/docker-compose-extra.yml index d0a9e15f7..9a5015aa9 100644 --- a/birdhouse/components/cowbird/config/magpie/docker-compose-extra.yml +++ b/birdhouse/components/cowbird/config/magpie/docker-compose-extra.yml @@ -18,4 +18,4 @@ services: cowbird-worker: env_file: # user/password for admin session to perform permission sync updates - - ./config/magpie/postgres-credentials.env + - ./components/magpie/postgres-credentials.env diff --git a/birdhouse/components/cowbird/default.env b/birdhouse/components/cowbird/default.env index 0d160735a..e1772b4b9 100644 --- a/birdhouse/components/cowbird/default.env +++ b/birdhouse/components/cowbird/default.env @@ -80,15 +80,8 @@ DELAYED_EVAL=" COWBIRD_PUBLIC_WORKSPACE_WPS_OUTPUTS_SUBDIR " -COMPONENT_DEPENDENCIES=' +COMPONENT_DEPENDENCIES=" $COMPONENT_DEPENDENCIES - ./config/wps_outputs-volume - ./config/magpie -' - -# this dependency is only required if the mongo instance is the one provided in config/mongodb. -# (include this for Cowbird<2.0.0) -#COMPONENT_DEPENDENCIES=" -# $COMPONENT_DEPENDENCIES -# ./config/mongodb -#" + ./components/wps_outputs-volume + ./components/magpie +" diff --git a/birdhouse/config/data-volume/docker-compose-extra.yml b/birdhouse/components/data-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/data-volume/docker-compose-extra.yml rename to birdhouse/components/data-volume/docker-compose-extra.yml diff --git a/birdhouse/config/finch/.gitignore b/birdhouse/components/finch/.gitignore similarity index 100% rename from birdhouse/config/finch/.gitignore rename to birdhouse/components/finch/.gitignore diff --git a/birdhouse/config/finch/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/finch/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/finch/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/finch/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..0ecaeafb2 --- /dev/null +++ b/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/finch/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_monitoring.py:ro diff --git a/birdhouse/components/finch/config/magpie/docker-compose-extra.yml b/birdhouse/components/finch/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..9f2102103 --- /dev/null +++ b/birdhouse/components/finch/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + magpie: + volumes: + - ./components/finch/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/finch-providers.cfg:ro diff --git a/birdhouse/config/finch/config/magpie/providers.cfg.template b/birdhouse/components/finch/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/finch/config/magpie/providers.cfg.template rename to birdhouse/components/finch/config/magpie/providers.cfg.template diff --git a/birdhouse/config/finch/config/wps_outputs-volume/docker-compose-extra.yml b/birdhouse/components/finch/config/wps_outputs-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/finch/config/wps_outputs-volume/docker-compose-extra.yml rename to birdhouse/components/finch/config/wps_outputs-volume/docker-compose-extra.yml diff --git a/birdhouse/config/finch/default.env b/birdhouse/components/finch/default.env similarity index 92% rename from birdhouse/config/finch/default.env rename to birdhouse/components/finch/default.env index 8bdaafc08..b11b0f701 100644 --- a/birdhouse/config/finch/default.env +++ b/birdhouse/components/finch/default.env @@ -21,8 +21,8 @@ export WEAVER_WPS_PROVIDERS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/wps_outputs-volume - ./config/postgres + ./components/wps_outputs-volume + ./components/postgres " OPTIONAL_VARS=" diff --git a/birdhouse/config/finch/docker-compose-extra.yml b/birdhouse/components/finch/docker-compose-extra.yml similarity index 89% rename from birdhouse/config/finch/docker-compose-extra.yml rename to birdhouse/components/finch/docker-compose-extra.yml index 4e751c54c..673f7b5ed 100644 --- a/birdhouse/config/finch/docker-compose-extra.yml +++ b/birdhouse/components/finch/docker-compose-extra.yml @@ -16,7 +16,7 @@ services: HTTP_PORT: 5000 PYWPS_CFG: /wps.cfg volumes: - - ./config/finch/wps.cfg:/wps.cfg + - ./components/finch/wps.cfg:/wps.cfg # - data:/opt/birdhouse/var/lib - /tmp restart: always diff --git a/birdhouse/config/finch/post-docker-compose-up b/birdhouse/components/finch/post-docker-compose-up similarity index 100% rename from birdhouse/config/finch/post-docker-compose-up rename to birdhouse/components/finch/post-docker-compose-up diff --git a/birdhouse/config/finch/service-config.json.template b/birdhouse/components/finch/service-config.json.template similarity index 100% rename from birdhouse/config/finch/service-config.json.template rename to birdhouse/components/finch/service-config.json.template diff --git a/birdhouse/config/finch/wps.cfg.template b/birdhouse/components/finch/wps.cfg.template similarity index 100% rename from birdhouse/config/finch/wps.cfg.template rename to birdhouse/components/finch/wps.cfg.template diff --git a/birdhouse/config/geoserver/.gitignore b/birdhouse/components/geoserver/.gitignore similarity index 91% rename from birdhouse/config/geoserver/.gitignore rename to birdhouse/components/geoserver/.gitignore index eb83bc769..fd6db5b1c 100644 --- a/birdhouse/config/geoserver/.gitignore +++ b/birdhouse/components/geoserver/.gitignore @@ -6,4 +6,3 @@ service-config.json geoserver_canarie_api_monitoring.py geoserver-magpie-provider.cfg config/proxy/canarie_api_monitoring.py -config/magpie/providers.cfg diff --git a/birdhouse/config/geoserver/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/geoserver/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/geoserver/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/geoserver/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..773e461dc --- /dev/null +++ b/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/geoserver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/geoserver_canarie_api_monitoring.py:ro diff --git a/birdhouse/components/geoserver/config/magpie/docker-compose-extra.yml b/birdhouse/components/geoserver/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..a17c870c2 --- /dev/null +++ b/birdhouse/components/geoserver/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + magpie: + volumes: + - ./components/geoserver/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/geoserver-providers.cfg:ro diff --git a/birdhouse/config/geoserver/config/magpie/providers.cfg b/birdhouse/components/geoserver/config/magpie/providers.cfg similarity index 100% rename from birdhouse/config/geoserver/config/magpie/providers.cfg rename to birdhouse/components/geoserver/config/magpie/providers.cfg diff --git a/birdhouse/config/geoserver/config/proxy/conf.extra-service.d/geoserver.conf.template b/birdhouse/components/geoserver/config/proxy/conf.extra-service.d/geoserver.conf.template similarity index 100% rename from birdhouse/config/geoserver/config/proxy/conf.extra-service.d/geoserver.conf.template rename to birdhouse/components/geoserver/config/proxy/conf.extra-service.d/geoserver.conf.template diff --git a/birdhouse/components/geoserver/config/proxy/docker-compose-extra.yml b/birdhouse/components/geoserver/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..20790afbf --- /dev/null +++ b/birdhouse/components/geoserver/config/proxy/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/geoserver/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/geoserver:ro diff --git a/birdhouse/config/geoserver/default.env b/birdhouse/components/geoserver/default.env similarity index 100% rename from birdhouse/config/geoserver/default.env rename to birdhouse/components/geoserver/default.env diff --git a/birdhouse/config/geoserver/docker-compose-extra.yml b/birdhouse/components/geoserver/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/geoserver/docker-compose-extra.yml rename to birdhouse/components/geoserver/docker-compose-extra.yml diff --git a/birdhouse/config/geoserver/pre-docker-compose-up b/birdhouse/components/geoserver/pre-docker-compose-up similarity index 100% rename from birdhouse/config/geoserver/pre-docker-compose-up rename to birdhouse/components/geoserver/pre-docker-compose-up diff --git a/birdhouse/config/geoserver/service-config.json.template b/birdhouse/components/geoserver/service-config.json.template similarity index 100% rename from birdhouse/config/geoserver/service-config.json.template rename to birdhouse/components/geoserver/service-config.json.template diff --git a/birdhouse/config/hummingbird/.gitignore b/birdhouse/components/hummingbird/.gitignore similarity index 100% rename from birdhouse/config/hummingbird/.gitignore rename to birdhouse/components/hummingbird/.gitignore diff --git a/birdhouse/config/hummingbird/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/hummingbird/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/hummingbird/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/hummingbird/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..3a82361c2 --- /dev/null +++ b/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/hummingbird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/hummingbird/config/data-volume/docker-compose-extra.yml b/birdhouse/components/hummingbird/config/data-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/hummingbird/config/data-volume/docker-compose-extra.yml rename to birdhouse/components/hummingbird/config/data-volume/docker-compose-extra.yml diff --git a/birdhouse/components/hummingbird/config/magpie/docker-compose-extra.yml b/birdhouse/components/hummingbird/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..a47b69e6e --- /dev/null +++ b/birdhouse/components/hummingbird/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + magpie: + volumes: + - ./components/hummingbird/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/hummingbird-providers.cfg:ro diff --git a/birdhouse/config/hummingbird/config/magpie/providers.cfg.template b/birdhouse/components/hummingbird/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/hummingbird/config/magpie/providers.cfg.template rename to birdhouse/components/hummingbird/config/magpie/providers.cfg.template diff --git a/birdhouse/config/hummingbird/config/wps_outputs-volume/docker-compose-extra.yml b/birdhouse/components/hummingbird/config/wps_outputs-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/hummingbird/config/wps_outputs-volume/docker-compose-extra.yml rename to birdhouse/components/hummingbird/config/wps_outputs-volume/docker-compose-extra.yml diff --git a/birdhouse/config/hummingbird/custom.cfg.template b/birdhouse/components/hummingbird/custom.cfg.template similarity index 100% rename from birdhouse/config/hummingbird/custom.cfg.template rename to birdhouse/components/hummingbird/custom.cfg.template diff --git a/birdhouse/config/hummingbird/default.env b/birdhouse/components/hummingbird/default.env similarity index 83% rename from birdhouse/config/hummingbird/default.env rename to birdhouse/components/hummingbird/default.env index f45f8e8d6..3a3ed4c94 100644 --- a/birdhouse/config/hummingbird/default.env +++ b/birdhouse/components/hummingbird/default.env @@ -14,9 +14,9 @@ export WEAVER_WPS_PROVIDERS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/postgres - ./config/wps_outputs-volume - ./config/data-volume + ./components/postgres + ./components/wps_outputs-volume + ./components/data-volume " OPTIONAL_VARS=" diff --git a/birdhouse/config/hummingbird/docker-compose-extra.yml b/birdhouse/components/hummingbird/docker-compose-extra.yml similarity index 81% rename from birdhouse/config/hummingbird/docker-compose-extra.yml rename to birdhouse/components/hummingbird/docker-compose-extra.yml index 965b77064..28c8b485d 100644 --- a/birdhouse/config/hummingbird/docker-compose-extra.yml +++ b/birdhouse/components/hummingbird/docker-compose-extra.yml @@ -14,7 +14,7 @@ services: environment: HOSTNAME: $HOSTNAME volumes: - - ./config/hummingbird/custom.cfg:/opt/birdhouse/src/hummingbird/custom.cfg + - ./components/hummingbird/custom.cfg:/opt/birdhouse/src/hummingbird/custom.cfg depends_on: - postgres restart: always diff --git a/birdhouse/config/hummingbird/service-config.json.template b/birdhouse/components/hummingbird/service-config.json.template similarity index 100% rename from birdhouse/config/hummingbird/service-config.json.template rename to birdhouse/components/hummingbird/service-config.json.template diff --git a/birdhouse/config/jupyterhub/.gitignore b/birdhouse/components/jupyterhub/.gitignore similarity index 100% rename from birdhouse/config/jupyterhub/.gitignore rename to birdhouse/components/jupyterhub/.gitignore diff --git a/birdhouse/config/jupyterhub/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/jupyterhub/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/jupyterhub/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/jupyterhub/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..074151fe9 --- /dev/null +++ b/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/jupyterhub/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/jupyterhub_canarie_api_monitoring.py:ro diff --git a/birdhouse/components/jupyterhub/config/magpie/docker-compose-extra.yml b/birdhouse/components/jupyterhub/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..ef1438e49 --- /dev/null +++ b/birdhouse/components/jupyterhub/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + magpie: + volumes: + - ./components/jupyterhub/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/jupyter.cfg:ro diff --git a/birdhouse/config/jupyterhub/config/magpie/providers.cfg.template b/birdhouse/components/jupyterhub/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/jupyterhub/config/magpie/providers.cfg.template rename to birdhouse/components/jupyterhub/config/magpie/providers.cfg.template diff --git a/birdhouse/config/jupyterhub/config/proxy/conf.extra-service.d/jupyterhub.conf.template b/birdhouse/components/jupyterhub/config/proxy/conf.extra-service.d/jupyterhub.conf.template similarity index 100% rename from birdhouse/config/jupyterhub/config/proxy/conf.extra-service.d/jupyterhub.conf.template rename to birdhouse/components/jupyterhub/config/proxy/conf.extra-service.d/jupyterhub.conf.template diff --git a/birdhouse/components/jupyterhub/config/proxy/docker-compose-extra.yml b/birdhouse/components/jupyterhub/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..76db7a7a3 --- /dev/null +++ b/birdhouse/components/jupyterhub/config/proxy/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/jupyterhub/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/jupyterhub:ro diff --git a/birdhouse/config/jupyterhub/custom_templates/.gitignore b/birdhouse/components/jupyterhub/custom_templates/.gitignore similarity index 100% rename from birdhouse/config/jupyterhub/custom_templates/.gitignore rename to birdhouse/components/jupyterhub/custom_templates/.gitignore diff --git a/birdhouse/config/jupyterhub/custom_templates/login.html.template b/birdhouse/components/jupyterhub/custom_templates/login.html.template similarity index 100% rename from birdhouse/config/jupyterhub/custom_templates/login.html.template rename to birdhouse/components/jupyterhub/custom_templates/login.html.template diff --git a/birdhouse/config/jupyterhub/default.env b/birdhouse/components/jupyterhub/default.env similarity index 99% rename from birdhouse/config/jupyterhub/default.env rename to birdhouse/components/jupyterhub/default.env index c37e1cf32..93c6132a5 100644 --- a/birdhouse/config/jupyterhub/default.env +++ b/birdhouse/components/jupyterhub/default.env @@ -103,5 +103,5 @@ OPTIONAL_VARS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/magpie + ./components/magpie " diff --git a/birdhouse/config/jupyterhub/docker-compose-extra.yml b/birdhouse/components/jupyterhub/docker-compose-extra.yml similarity index 92% rename from birdhouse/config/jupyterhub/docker-compose-extra.yml rename to birdhouse/components/jupyterhub/docker-compose-extra.yml index 32dd395ed..15df6f921 100644 --- a/birdhouse/config/jupyterhub/docker-compose-extra.yml +++ b/birdhouse/components/jupyterhub/docker-compose-extra.yml @@ -29,8 +29,8 @@ services: USER_WORKSPACE_GID: ${USER_WORKSPACE_GID} JUPYTERHUB_CRYPT_KEY: ${JUPYTERHUB_CRYPT_KEY} volumes: - - ./config/jupyterhub/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro - - ./config/jupyterhub/custom_templates:/custom_templates:ro + - ./components/jupyterhub/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro + - ./components/jupyterhub/custom_templates:/custom_templates:ro - ${JUPYTERHUB_USER_DATA_DIR}:${JUPYTERHUB_USER_DATA_DIR} - jupyterhub_data_persistence:/persist:rw - /var/run/docker.sock:/var/run/docker.sock:rw diff --git a/birdhouse/config/jupyterhub/jupyterhub_config.py.original_generated b/birdhouse/components/jupyterhub/jupyterhub_config.py.original_generated similarity index 100% rename from birdhouse/config/jupyterhub/jupyterhub_config.py.original_generated rename to birdhouse/components/jupyterhub/jupyterhub_config.py.original_generated diff --git a/birdhouse/config/jupyterhub/jupyterhub_config.py.template b/birdhouse/components/jupyterhub/jupyterhub_config.py.template similarity index 99% rename from birdhouse/config/jupyterhub/jupyterhub_config.py.template rename to birdhouse/components/jupyterhub/jupyterhub_config.py.template index 896c10c63..ccc4afb4c 100644 --- a/birdhouse/config/jupyterhub/jupyterhub_config.py.template +++ b/birdhouse/components/jupyterhub/jupyterhub_config.py.template @@ -43,7 +43,6 @@ if os.getenv("JUPYTERHUB_CRYPT_KEY"): } ] - c.JupyterHub.cookie_secret_file = '/persist/jupyterhub_cookie_secret' c.JupyterHub.db_url = '/persist/jupyterhub.sqlite' diff --git a/birdhouse/config/jupyterhub/pre-docker-compose-up b/birdhouse/components/jupyterhub/pre-docker-compose-up similarity index 100% rename from birdhouse/config/jupyterhub/pre-docker-compose-up rename to birdhouse/components/jupyterhub/pre-docker-compose-up diff --git a/birdhouse/config/jupyterhub/service-config.json.template b/birdhouse/components/jupyterhub/service-config.json.template similarity index 100% rename from birdhouse/config/jupyterhub/service-config.json.template rename to birdhouse/components/jupyterhub/service-config.json.template diff --git a/birdhouse/config/magpie/.gitignore b/birdhouse/components/magpie/.gitignore similarity index 100% rename from birdhouse/config/magpie/.gitignore rename to birdhouse/components/magpie/.gitignore diff --git a/birdhouse/config/magpie/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/magpie/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/magpie/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/magpie/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..3ea6c182b --- /dev/null +++ b/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/magpie/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/magpie_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/magpie/config/proxy/conf.extra-service.d/magpie.conf.template b/birdhouse/components/magpie/config/proxy/conf.extra-service.d/magpie.conf.template similarity index 100% rename from birdhouse/config/magpie/config/proxy/conf.extra-service.d/magpie.conf.template rename to birdhouse/components/magpie/config/proxy/conf.extra-service.d/magpie.conf.template diff --git a/birdhouse/components/magpie/config/proxy/docker-compose-extra.yml b/birdhouse/components/magpie/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..c7ccd8e6a --- /dev/null +++ b/birdhouse/components/magpie/config/proxy/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/magpie/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/magpie:ro diff --git a/birdhouse/config/magpie/default.env b/birdhouse/components/magpie/default.env similarity index 100% rename from birdhouse/config/magpie/default.env rename to birdhouse/components/magpie/default.env diff --git a/birdhouse/config/magpie/docker-compose-extra.yml b/birdhouse/components/magpie/docker-compose-extra.yml similarity index 72% rename from birdhouse/config/magpie/docker-compose-extra.yml rename to birdhouse/components/magpie/docker-compose-extra.yml index 398cd7832..0be77492c 100644 --- a/birdhouse/config/magpie/docker-compose-extra.yml +++ b/birdhouse/components/magpie/docker-compose-extra.yml @@ -23,16 +23,16 @@ services: MAGPIE_PORT: 2001 FORWARDED_ALLOW_IPS: "*" env_file: - - ./config/magpie/postgres-credentials.env + - ./components/magpie/postgres-credentials.env depends_on: - postgres-magpie links: - postgres-magpie volumes: - - ./config/magpie/postgres-credentials.env:/opt/local/src/magpie/env/postgres.env - - ./config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/providers.cfg - - ./config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/permissions.cfg - - ./config/magpie/magpie.ini:/opt/local/src/magpie/config/magpie.ini + - ./components/magpie/postgres-credentials.env:/opt/local/src/magpie/env/postgres.env + - ./components/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/providers.cfg + - ./components/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/permissions.cfg + - ./components/magpie/magpie.ini:/opt/local/src/magpie/config/magpie.ini restart: always logging: *default-logging @@ -41,11 +41,11 @@ services: container_name: postgres-magpie # ports: # should not be exposed directly, enable 'optional-components/database-external-ports' as needed env_file: - - ./config/magpie/postgres-credentials.env + - ./components/magpie/postgres-credentials.env environment: PGDATA: /var/lib/postgresql/data/pgdata volumes: - ${MAGPIE_PERSIST_DIR}:/var/lib/postgresql/data/pgdata - - ./config/magpie/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d + - ./components/magpie/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d restart: always logging: *default-logging diff --git a/birdhouse/config/magpie/docker-entrypoint-initdb.d/create-db.sql.template b/birdhouse/components/magpie/docker-entrypoint-initdb.d/create-db.sql.template similarity index 100% rename from birdhouse/config/magpie/docker-entrypoint-initdb.d/create-db.sql.template rename to birdhouse/components/magpie/docker-entrypoint-initdb.d/create-db.sql.template diff --git a/birdhouse/config/magpie/magpie.ini.template b/birdhouse/components/magpie/magpie.ini.template similarity index 100% rename from birdhouse/config/magpie/magpie.ini.template rename to birdhouse/components/magpie/magpie.ini.template diff --git a/birdhouse/config/magpie/permissions.cfg.template b/birdhouse/components/magpie/permissions.cfg.template similarity index 100% rename from birdhouse/config/magpie/permissions.cfg.template rename to birdhouse/components/magpie/permissions.cfg.template diff --git a/birdhouse/config/magpie/postgres-credentials.env.template b/birdhouse/components/magpie/postgres-credentials.env.template similarity index 100% rename from birdhouse/config/magpie/postgres-credentials.env.template rename to birdhouse/components/magpie/postgres-credentials.env.template diff --git a/birdhouse/config/magpie/providers.cfg.template b/birdhouse/components/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/magpie/providers.cfg.template rename to birdhouse/components/magpie/providers.cfg.template diff --git a/birdhouse/config/mongodb/default.env b/birdhouse/components/mongodb/default.env similarity index 100% rename from birdhouse/config/mongodb/default.env rename to birdhouse/components/mongodb/default.env diff --git a/birdhouse/config/mongodb/docker-compose-extra.yml b/birdhouse/components/mongodb/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/mongodb/docker-compose-extra.yml rename to birdhouse/components/mongodb/docker-compose-extra.yml diff --git a/birdhouse/config/portainer/.gitignore b/birdhouse/components/portainer/.gitignore similarity index 100% rename from birdhouse/config/portainer/.gitignore rename to birdhouse/components/portainer/.gitignore diff --git a/birdhouse/config/portainer/config/proxy/conf.extra-service.d/portainer.conf.template b/birdhouse/components/portainer/config/proxy/conf.extra-service.d/portainer.conf.template similarity index 100% rename from birdhouse/config/portainer/config/proxy/conf.extra-service.d/portainer.conf.template rename to birdhouse/components/portainer/config/proxy/conf.extra-service.d/portainer.conf.template diff --git a/birdhouse/components/portainer/config/proxy/docker-compose-extra.yml b/birdhouse/components/portainer/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..a881165a6 --- /dev/null +++ b/birdhouse/components/portainer/config/proxy/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/portainer/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/portainer:ro diff --git a/birdhouse/config/portainer/docker-compose-extra.yml b/birdhouse/components/portainer/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/portainer/docker-compose-extra.yml rename to birdhouse/components/portainer/docker-compose-extra.yml diff --git a/birdhouse/config/postgres/.gitignore b/birdhouse/components/postgres/.gitignore similarity index 100% rename from birdhouse/config/postgres/.gitignore rename to birdhouse/components/postgres/.gitignore diff --git a/birdhouse/config/postgres/credentials.env.template b/birdhouse/components/postgres/credentials.env.template similarity index 100% rename from birdhouse/config/postgres/credentials.env.template rename to birdhouse/components/postgres/credentials.env.template diff --git a/birdhouse/config/postgres/default.env b/birdhouse/components/postgres/default.env similarity index 100% rename from birdhouse/config/postgres/default.env rename to birdhouse/components/postgres/default.env diff --git a/birdhouse/config/postgres/docker-compose-extra.yml b/birdhouse/components/postgres/docker-compose-extra.yml similarity index 83% rename from birdhouse/config/postgres/docker-compose-extra.yml rename to birdhouse/components/postgres/docker-compose-extra.yml index db004bf7f..8bdfca329 100644 --- a/birdhouse/config/postgres/docker-compose-extra.yml +++ b/birdhouse/components/postgres/docker-compose-extra.yml @@ -14,11 +14,11 @@ services: # ports: # should not be exposed directly, enable 'optional-components/database-external-ports' as needed volumes: - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/data/pgdata - - ./config/postgres/postgres-setup.sh:/postgres-setup.sh + - ./components/postgres/postgres-setup.sh:/postgres-setup.sh environment: PGDATA: /var/lib/postgresql/data/pgdata POSTGRES_DATABASES_TO_CREATE: ${POSTGRES_DATABASES_TO_CREATE} env_file: - - ./config/postgres/credentials.env + - ./components/postgres/credentials.env restart: always logging: *default-logging diff --git a/birdhouse/config/postgres/postgres-setup.sh b/birdhouse/components/postgres/postgres-setup.sh similarity index 100% rename from birdhouse/config/postgres/postgres-setup.sh rename to birdhouse/components/postgres/postgres-setup.sh diff --git a/birdhouse/config/proxy/.gitignore b/birdhouse/components/proxy/.gitignore similarity index 100% rename from birdhouse/config/proxy/.gitignore rename to birdhouse/components/proxy/.gitignore diff --git a/birdhouse/config/proxy/conf.d/.gitignore b/birdhouse/components/proxy/conf.d/.gitignore similarity index 100% rename from birdhouse/config/proxy/conf.d/.gitignore rename to birdhouse/components/proxy/conf.d/.gitignore diff --git a/birdhouse/config/proxy/conf.d/all-services.include.template b/birdhouse/components/proxy/conf.d/all-services.include.template similarity index 100% rename from birdhouse/config/proxy/conf.d/all-services.include.template rename to birdhouse/components/proxy/conf.d/all-services.include.template diff --git a/birdhouse/config/proxy/conf.d/cors.include b/birdhouse/components/proxy/conf.d/cors.include similarity index 100% rename from birdhouse/config/proxy/conf.d/cors.include rename to birdhouse/components/proxy/conf.d/cors.include diff --git a/birdhouse/config/proxy/conf.d/frontend.conf.template b/birdhouse/components/proxy/conf.d/frontend.conf.template similarity index 100% rename from birdhouse/config/proxy/conf.d/frontend.conf.template rename to birdhouse/components/proxy/conf.d/frontend.conf.template diff --git a/birdhouse/config/proxy/conf.d/redirect-to-https.include b/birdhouse/components/proxy/conf.d/redirect-to-https.include similarity index 100% rename from birdhouse/config/proxy/conf.d/redirect-to-https.include rename to birdhouse/components/proxy/conf.d/redirect-to-https.include diff --git a/birdhouse/config/proxy/default.env b/birdhouse/components/proxy/default.env similarity index 79% rename from birdhouse/config/proxy/default.env rename to birdhouse/components/proxy/default.env index 65e21656e..5b67c210a 100644 --- a/birdhouse/config/proxy/default.env +++ b/birdhouse/components/proxy/default.env @@ -8,6 +8,9 @@ export PROXY_READ_TIMEOUT_VALUE="240s" # Content of "location /" in file config/proxy/conf.d/all-services.include.template # Useful to have a custom homepage. +# Note that the default homepage will become the jupyterhub login page if the jupyterhub component is enabled. +# If the jupyterhub component is not enabled, it is highly recommended to create a custom homepage since the magpie +# landing page is not the most user-friendly option. export PROXY_ROOT_LOCATION="return 302 https://\$host/jupyter/hub/login;" export INCLUDE_FOR_PORT_80='$([ x"$ALLOW_UNSECURE_HTTP" = x"True" ] && echo "include /etc/nginx/conf.d/all-services.include;" || echo "include /etc/nginx/conf.d/redirect-to-https.include;")' diff --git a/birdhouse/config/proxy/docker-compose-extra.yml b/birdhouse/components/proxy/docker-compose-extra.yml similarity index 76% rename from birdhouse/config/proxy/docker-compose-extra.yml rename to birdhouse/components/proxy/docker-compose-extra.yml index dfa629e68..3cad6523e 100644 --- a/birdhouse/config/proxy/docker-compose-extra.yml +++ b/birdhouse/components/proxy/docker-compose-extra.yml @@ -15,10 +15,10 @@ services: - "80:80" - "443:${PROXY_SECURE_PORT}" volumes: - - ./config/proxy/conf.d:/etc/nginx/conf.d - - ./config/proxy/nginx.conf:/etc/nginx/nginx.conf + - ./components/proxy/conf.d:/etc/nginx/conf.d + - ./components/proxy/nginx.conf:/etc/nginx/nginx.conf - ${SSL_CERTIFICATE}:/etc/nginx/cert.pem - - ./config/proxy/static:/static + - ./components/proxy/static:/static environment: # https://github.com/bird-house/birdhouse-deploy/issues/198 REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt diff --git a/birdhouse/config/proxy/nginx.conf.template b/birdhouse/components/proxy/nginx.conf.template similarity index 100% rename from birdhouse/config/proxy/nginx.conf.template rename to birdhouse/components/proxy/nginx.conf.template diff --git a/birdhouse/config/proxy/pre-docker-compose-up b/birdhouse/components/proxy/pre-docker-compose-up similarity index 100% rename from birdhouse/config/proxy/pre-docker-compose-up rename to birdhouse/components/proxy/pre-docker-compose-up diff --git a/birdhouse/config/raven/.gitignore b/birdhouse/components/raven/.gitignore similarity index 100% rename from birdhouse/config/raven/.gitignore rename to birdhouse/components/raven/.gitignore diff --git a/birdhouse/config/raven/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/raven/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/raven/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/raven/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..e5b51c6f3 --- /dev/null +++ b/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/raven/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_monitoring.py:ro diff --git a/birdhouse/components/raven/config/magpie/docker-compose-extra.yml b/birdhouse/components/raven/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..0dfe768c6 --- /dev/null +++ b/birdhouse/components/raven/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + magpie: + volumes: + - ./components/raven/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/raven-providers.cfg:ro diff --git a/birdhouse/config/raven/config/magpie/providers.cfg.template b/birdhouse/components/raven/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/raven/config/magpie/providers.cfg.template rename to birdhouse/components/raven/config/magpie/providers.cfg.template diff --git a/birdhouse/config/raven/config/wps_outputs-volume/docker-compose-extra.yml b/birdhouse/components/raven/config/wps_outputs-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/raven/config/wps_outputs-volume/docker-compose-extra.yml rename to birdhouse/components/raven/config/wps_outputs-volume/docker-compose-extra.yml diff --git a/birdhouse/config/raven/default.env b/birdhouse/components/raven/default.env similarity index 94% rename from birdhouse/config/raven/default.env rename to birdhouse/components/raven/default.env index 74d5093e3..86d1e7073 100644 --- a/birdhouse/config/raven/default.env +++ b/birdhouse/components/raven/default.env @@ -23,8 +23,8 @@ export WEAVER_WPS_PROVIDERS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/postgres - ./config/wps_outputs-volume + ./components/postgres + ./components/wps_outputs-volume " OPTIONAL_VARS=" diff --git a/birdhouse/config/raven/docker-compose-extra.yml b/birdhouse/components/raven/docker-compose-extra.yml similarity index 89% rename from birdhouse/config/raven/docker-compose-extra.yml rename to birdhouse/components/raven/docker-compose-extra.yml index 920f1b6dc..25d0d3a79 100644 --- a/birdhouse/config/raven/docker-compose-extra.yml +++ b/birdhouse/components/raven/docker-compose-extra.yml @@ -15,7 +15,7 @@ services: PYWPS_CFG: /wps.cfg GEO_URL: "${RAVEN_GEO_URL}" volumes: - - ./config/raven/wps.cfg:/wps.cfg + - ./components/raven/wps.cfg:/wps.cfg - /tmp restart: always logging: *default-logging diff --git a/birdhouse/config/raven/post-docker-compose-up b/birdhouse/components/raven/post-docker-compose-up similarity index 100% rename from birdhouse/config/raven/post-docker-compose-up rename to birdhouse/components/raven/post-docker-compose-up diff --git a/birdhouse/config/raven/service-config.json.template b/birdhouse/components/raven/service-config.json.template similarity index 100% rename from birdhouse/config/raven/service-config.json.template rename to birdhouse/components/raven/service-config.json.template diff --git a/birdhouse/config/raven/wps.cfg.template b/birdhouse/components/raven/wps.cfg.template similarity index 100% rename from birdhouse/config/raven/wps.cfg.template rename to birdhouse/components/raven/wps.cfg.template diff --git a/birdhouse/components/stac/config/twitcher/docker-compose-extra.yml b/birdhouse/components/stac/config/twitcher/docker-compose-extra.yml index b84f09b74..6f9ccb077 100644 --- a/birdhouse/components/stac/config/twitcher/docker-compose-extra.yml +++ b/birdhouse/components/stac/config/twitcher/docker-compose-extra.yml @@ -5,6 +5,6 @@ services: twitcher: volumes: # NOTE: MagpieAdapter hooks are defined within Magpie config, but it is actually Twitcher proxy that runs them - # target mount location depends on 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable that is found under `birdhouse/config/twitcher/docker-compose-extra.yml` + # target mount location depends on 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable that is found under `birdhouse/components/twitcher/docker-compose-extra.yml` - ./components/stac/config/magpie/config.yml:/opt/birdhouse/src/magpie/config/stac-config.yml:ro - ./components/stac/config/magpie/stac_hooks.py:/opt/birdhouse/src/magpie/hooks/stac_hooks.py:ro diff --git a/birdhouse/config/thredds/.gitignore b/birdhouse/components/thredds/.gitignore similarity index 100% rename from birdhouse/config/thredds/.gitignore rename to birdhouse/components/thredds/.gitignore diff --git a/birdhouse/config/thredds/catalog.xml.template b/birdhouse/components/thredds/catalog.xml.template similarity index 100% rename from birdhouse/config/thredds/catalog.xml.template rename to birdhouse/components/thredds/catalog.xml.template diff --git a/birdhouse/config/thredds/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/thredds/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..c02523e54 --- /dev/null +++ b/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/thredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_monitoring.py:ro diff --git a/birdhouse/components/thredds/config/magpie/docker-compose-extra.yml b/birdhouse/components/thredds/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..c559273be --- /dev/null +++ b/birdhouse/components/thredds/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + magpie: + volumes: + - ./components/thredds/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/thredds-providers.cfg:ro diff --git a/birdhouse/config/thredds/config/magpie/providers.cfg.template b/birdhouse/components/thredds/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/thredds/config/magpie/providers.cfg.template rename to birdhouse/components/thredds/config/magpie/providers.cfg.template diff --git a/birdhouse/config/thredds/config/proxy/conf.extra-service.d/thredds.conf.template b/birdhouse/components/thredds/config/proxy/conf.extra-service.d/thredds.conf.template similarity index 100% rename from birdhouse/config/thredds/config/proxy/conf.extra-service.d/thredds.conf.template rename to birdhouse/components/thredds/config/proxy/conf.extra-service.d/thredds.conf.template diff --git a/birdhouse/components/thredds/config/proxy/docker-compose-extra.yml b/birdhouse/components/thredds/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..803512124 --- /dev/null +++ b/birdhouse/components/thredds/config/proxy/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/thredds/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/thredds:ro + links: + - thredds diff --git a/birdhouse/config/thredds/default.env b/birdhouse/components/thredds/default.env similarity index 100% rename from birdhouse/config/thredds/default.env rename to birdhouse/components/thredds/default.env diff --git a/birdhouse/config/thredds/docker-compose-extra.yml b/birdhouse/components/thredds/docker-compose-extra.yml similarity index 73% rename from birdhouse/config/thredds/docker-compose-extra.yml rename to birdhouse/components/thredds/docker-compose-extra.yml index 26c4609af..3cc191c31 100644 --- a/birdhouse/config/thredds/docker-compose-extra.yml +++ b/birdhouse/components/thredds/docker-compose-extra.yml @@ -11,7 +11,7 @@ services: image: ${THREDDS_IMAGE} container_name: thredds env_file: - - ./config/thredds/thredds.env + - ./components/thredds/thredds.env environment: # for reconstructing proper URL back to user when Thredds behind proxy # because Twitcher eats the "Host" http header set by Nginx @@ -21,10 +21,10 @@ services: - ${THREDDS_SERVICE_DATA_LOCATION_ON_HOST}:${THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER} - ${THREDDS_DATASET_LOCATION_ON_HOST}:${THREDDS_DATASET_LOCATION_ON_CONTAINER} - wps_outputs:${THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER}/wps_outputs - - ./config/thredds/catalog.xml:/usr/local/tomcat/content/thredds/catalog.xml:ro - - ./config/thredds/threddsConfig.xml:/usr/local/tomcat/content/thredds/threddsConfig.xml:ro - - ./config/thredds/wmsConfig.xml:/usr/local/tomcat/content/thredds/wmsConfig.xml:ro - - ./config/thredds/entrypointwrapper:/entrypointwrapper:ro + - ./components/thredds/catalog.xml:/usr/local/tomcat/content/thredds/catalog.xml:ro + - ./components/thredds/threddsConfig.xml:/usr/local/tomcat/content/thredds/threddsConfig.xml:ro + - ./components/thredds/wmsConfig.xml:/usr/local/tomcat/content/thredds/wmsConfig.xml:ro + - ./components/thredds/entrypointwrapper:/entrypointwrapper:ro entrypoint: /entrypointwrapper restart: always logging: *default-logging diff --git a/birdhouse/config/thredds/entrypointwrapper b/birdhouse/components/thredds/entrypointwrapper similarity index 100% rename from birdhouse/config/thredds/entrypointwrapper rename to birdhouse/components/thredds/entrypointwrapper diff --git a/birdhouse/config/thredds/pre-docker-compose-up b/birdhouse/components/thredds/pre-docker-compose-up similarity index 100% rename from birdhouse/config/thredds/pre-docker-compose-up rename to birdhouse/components/thredds/pre-docker-compose-up diff --git a/birdhouse/config/thredds/service-config.json.template b/birdhouse/components/thredds/service-config.json.template similarity index 100% rename from birdhouse/config/thredds/service-config.json.template rename to birdhouse/components/thredds/service-config.json.template diff --git a/birdhouse/config/thredds/thredds.env b/birdhouse/components/thredds/thredds.env similarity index 100% rename from birdhouse/config/thredds/thredds.env rename to birdhouse/components/thredds/thredds.env diff --git a/birdhouse/config/thredds/threddsConfig.xml.template b/birdhouse/components/thredds/threddsConfig.xml.template similarity index 100% rename from birdhouse/config/thredds/threddsConfig.xml.template rename to birdhouse/components/thredds/threddsConfig.xml.template diff --git a/birdhouse/config/thredds/wmsConfig.xml b/birdhouse/components/thredds/wmsConfig.xml similarity index 100% rename from birdhouse/config/thredds/wmsConfig.xml rename to birdhouse/components/thredds/wmsConfig.xml diff --git a/birdhouse/config/twitcher/.gitignore b/birdhouse/components/twitcher/.gitignore similarity index 100% rename from birdhouse/config/twitcher/.gitignore rename to birdhouse/components/twitcher/.gitignore diff --git a/birdhouse/config/twitcher/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/twitcher/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/twitcher/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/twitcher/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..e23266c62 --- /dev/null +++ b/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/twitcher/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/twitcher_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template b/birdhouse/components/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template similarity index 100% rename from birdhouse/config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template rename to birdhouse/components/twitcher/config/proxy/conf.extra-service.d/twitcher.conf.template diff --git a/birdhouse/components/twitcher/config/proxy/docker-compose-extra.yml b/birdhouse/components/twitcher/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..a175ae6b4 --- /dev/null +++ b/birdhouse/components/twitcher/config/proxy/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/twitcher/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/twitcher:ro diff --git a/birdhouse/config/twitcher/default.env b/birdhouse/components/twitcher/default.env similarity index 97% rename from birdhouse/config/twitcher/default.env rename to birdhouse/components/twitcher/default.env index 6319ddeed..82fb4ff67 100644 --- a/birdhouse/config/twitcher/default.env +++ b/birdhouse/components/twitcher/default.env @@ -30,5 +30,5 @@ OPTIONAL_VARS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/magpie + ./components/magpie " diff --git a/birdhouse/config/twitcher/docker-compose-extra.yml b/birdhouse/components/twitcher/docker-compose-extra.yml similarity index 88% rename from birdhouse/config/twitcher/docker-compose-extra.yml rename to birdhouse/components/twitcher/docker-compose-extra.yml index 0fd79afaa..2a982ad30 100644 --- a/birdhouse/config/twitcher/docker-compose-extra.yml +++ b/birdhouse/components/twitcher/docker-compose-extra.yml @@ -20,14 +20,14 @@ services: # Other Magpie components are unknown and ignored by Twitcher itself. MAGPIE_PROVIDERS_CONFIG_PATH: "/opt/birdhouse/src/magpie/config" env_file: - - ./config/magpie/postgres-credentials.env + - ./components/magpie/postgres-credentials.env depends_on: - postgres-magpie - magpie links: - postgres-magpie volumes: - - ./config/twitcher/twitcher.ini:/opt/birdhouse/src/twitcher/twitcher.ini + - ./components/twitcher/twitcher.ini:/opt/birdhouse/src/twitcher/twitcher.ini command: "pserve /opt/birdhouse/src/twitcher/twitcher.ini" restart: always logging: *default-logging diff --git a/birdhouse/config/twitcher/twitcher.ini.template b/birdhouse/components/twitcher/twitcher.ini.template similarity index 100% rename from birdhouse/config/twitcher/twitcher.ini.template rename to birdhouse/components/twitcher/twitcher.ini.template diff --git a/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml index e441d76eb..e55b15c77 100644 --- a/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml @@ -5,7 +5,7 @@ services: proxy: volumes: # NOTE: - # Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/config/canarie-api/docker_configuration.py' + # Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/components/canarie-api/docker_configuration.py' # This ensures that the alphabetical loading order it defines will first load the default configs, then will load # the weaver config, and then all python configuration within 'optional-components/canarie-api-full-monitoring'. # It is important to load Weaver before, as the full monitoring need to know if 'Weaver' service is added to the diff --git a/birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template b/birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template index 97cc63181..f6ed0440d 100644 --- a/birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template +++ b/birdhouse/components/weaver/config/proxy/conf.extra-service.d/weaver.conf.template @@ -18,7 +18,7 @@ # NOTE: # this is needed only if not using the location already provided by the core configuration - # see 'birdhouse/config/proxy/conf.d/all-services.include.template' + # see 'birdhouse/components/proxy/conf.d/all-services.include.template' # location where process job outputs will be accessible #location ^~ ${WEAVER_WPS_OUTPUTS_PATH}/ { # alias ${WEAVER_WPS_OUTPUTS_DIR}/; diff --git a/birdhouse/components/weaver/config/twitcher/docker-compose-extra.yml b/birdhouse/components/weaver/config/twitcher/docker-compose-extra.yml index fca74d5dc..d92f21bc3 100644 --- a/birdhouse/components/weaver/config/twitcher/docker-compose-extra.yml +++ b/birdhouse/components/weaver/config/twitcher/docker-compose-extra.yml @@ -5,6 +5,6 @@ services: twitcher: volumes: # NOTE: MagpieAdapter hooks are defined within Magpie config, but it is actually Twitcher proxy that runs them - # target mount location depends on 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable that is found under `birdhouse/config/twitcher/docker-compose-extra.yml` + # target mount location depends on 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable that is found under `birdhouse/components/twitcher/docker-compose-extra.yml` - ./components/weaver/config/magpie/config.yml:/opt/birdhouse/src/magpie/config/weaver-config.yml:ro - ./components/weaver/config/magpie/weaver_hooks.py:/opt/birdhouse/src/magpie/hooks/weaver_hooks.py:ro diff --git a/birdhouse/components/weaver/docker-compose-extra.yml b/birdhouse/components/weaver/docker-compose-extra.yml index d4933d4c5..ec3afc4fb 100644 --- a/birdhouse/components/weaver/docker-compose-extra.yml +++ b/birdhouse/components/weaver/docker-compose-extra.yml @@ -21,7 +21,7 @@ services: HOSTNAME: ${PAVICS_FQDN} FORWARDED_ALLOW_IPS: "*" #env_file: - # - ./config/mongodb/credentials.env + # - ./components/mongodb/credentials.env depends_on: - weaver-mongodb links: @@ -47,7 +47,7 @@ services: environment: DOCKER_HOST: "tcp://docker-proxy:2375" #env_file: - # - ./config/mongodb/credentials.env + # - ./components/mongodb/credentials.env depends_on: # no 'default' network here such that the worker is not accessible from proxy/http - weaver-mongodb diff --git a/birdhouse/config/wps_outputs-volume/.gitignore b/birdhouse/components/wps_outputs-volume/.gitignore similarity index 100% rename from birdhouse/config/wps_outputs-volume/.gitignore rename to birdhouse/components/wps_outputs-volume/.gitignore diff --git a/birdhouse/config/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/components/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..e2de96762 --- /dev/null +++ b/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/wps_outputs-volume_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/wps_outputs-volume/config/proxy/conf.extra-service.d/wps_outputs-volume.conf.template b/birdhouse/components/wps_outputs-volume/config/proxy/conf.extra-service.d/wps_outputs-volume.conf.template similarity index 100% rename from birdhouse/config/wps_outputs-volume/config/proxy/conf.extra-service.d/wps_outputs-volume.conf.template rename to birdhouse/components/wps_outputs-volume/config/proxy/conf.extra-service.d/wps_outputs-volume.conf.template diff --git a/birdhouse/components/wps_outputs-volume/config/proxy/docker-compose-extra.yml b/birdhouse/components/wps_outputs-volume/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..f4b0cef8a --- /dev/null +++ b/birdhouse/components/wps_outputs-volume/config/proxy/docker-compose-extra.yml @@ -0,0 +1,6 @@ +version: "3.4" +services: + proxy: + volumes: + - ./components/wps_outputs-volume/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/wps_outputs-volume:ro + - wps_outputs:/data/wps_outputs diff --git a/birdhouse/config/wps_outputs-volume/default.env b/birdhouse/components/wps_outputs-volume/default.env similarity index 100% rename from birdhouse/config/wps_outputs-volume/default.env rename to birdhouse/components/wps_outputs-volume/default.env diff --git a/birdhouse/config/wps_outputs-volume/docker-compose-extra.yml b/birdhouse/components/wps_outputs-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/wps_outputs-volume/docker-compose-extra.yml rename to birdhouse/components/wps_outputs-volume/docker-compose-extra.yml diff --git a/birdhouse/config/.gitignore b/birdhouse/config/.gitignore deleted file mode 100644 index 948f24250..000000000 --- a/birdhouse/config/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -# Old paths. Keep these so that old config files remain uncommittable after updates. -postgres-magpie/ -catalog/ -frontend/ -malleefowl/ -ncops/ -ncwms2/ -project-api/ -solr/ -phoenix/ -# moved to deprecated-components -flyingpigeon/ diff --git a/birdhouse/config/canarie-api/config/proxy/docker-compose-extra.yml b/birdhouse/config/canarie-api/config/proxy/docker-compose-extra.yml deleted file mode 100644 index 173baf53b..000000000 --- a/birdhouse/config/canarie-api/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/canarie-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/canarie-api:ro - - ./config/canarie-api/docker_configuration.py:/config/docker_configuration.py - - ./config/canarie-api/entrypoint:/entrypoint:ro - environment: - CANARIE_API_CONFIG_FN: /config/docker_configuration.py - CANARIE_MONITORING_EXTRA_CONF_DIR: ${CANARIE_MONITORING_EXTRA_CONF_DIR} - entrypoint: /entrypoint diff --git a/birdhouse/config/finch/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/finch/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 94f648a3e..000000000 --- a/birdhouse/config/finch/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/finch/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/finch/config/magpie/docker-compose-extra.yml b/birdhouse/config/finch/config/magpie/docker-compose-extra.yml deleted file mode 100644 index 91381eb64..000000000 --- a/birdhouse/config/finch/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/finch/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/finch-providers.cfg:ro diff --git a/birdhouse/config/geoserver/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/geoserver/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 88f777636..000000000 --- a/birdhouse/config/geoserver/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/geoserver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/geoserver_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/geoserver/config/magpie/docker-compose-extra.yml b/birdhouse/config/geoserver/config/magpie/docker-compose-extra.yml deleted file mode 100644 index de0a96d6b..000000000 --- a/birdhouse/config/geoserver/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/geoserver/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/geoserver-providers.cfg:ro diff --git a/birdhouse/config/geoserver/config/proxy/docker-compose-extra.yml b/birdhouse/config/geoserver/config/proxy/docker-compose-extra.yml deleted file mode 100644 index 53c5ff3a1..000000000 --- a/birdhouse/config/geoserver/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/geoserver/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/geoserver:ro diff --git a/birdhouse/config/hummingbird/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/hummingbird/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 4b1c29405..000000000 --- a/birdhouse/config/hummingbird/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/hummingbird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/hummingbird/config/magpie/docker-compose-extra.yml b/birdhouse/config/hummingbird/config/magpie/docker-compose-extra.yml deleted file mode 100644 index cbf5eb312..000000000 --- a/birdhouse/config/hummingbird/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/hummingbird/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/hummingbird-providers.cfg:ro diff --git a/birdhouse/config/jupyterhub/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/jupyterhub/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 08aa88ca6..000000000 --- a/birdhouse/config/jupyterhub/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/jupyterhub/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/jupyterhub_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/jupyterhub/config/magpie/docker-compose-extra.yml b/birdhouse/config/jupyterhub/config/magpie/docker-compose-extra.yml deleted file mode 100644 index a4ed9524c..000000000 --- a/birdhouse/config/jupyterhub/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/jupyterhub/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/jupyter.cfg:ro diff --git a/birdhouse/config/jupyterhub/config/proxy/docker-compose-extra.yml b/birdhouse/config/jupyterhub/config/proxy/docker-compose-extra.yml deleted file mode 100644 index 4c2d38127..000000000 --- a/birdhouse/config/jupyterhub/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/jupyterhub/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/jupyterhub:ro diff --git a/birdhouse/config/magpie/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/magpie/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index c5f94a305..000000000 --- a/birdhouse/config/magpie/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/magpie/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/magpie_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/magpie/config/proxy/docker-compose-extra.yml b/birdhouse/config/magpie/config/proxy/docker-compose-extra.yml deleted file mode 100644 index 763a6da9d..000000000 --- a/birdhouse/config/magpie/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/magpie/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/magpie:ro diff --git a/birdhouse/config/portainer/config/proxy/docker-compose-extra.yml b/birdhouse/config/portainer/config/proxy/docker-compose-extra.yml deleted file mode 100644 index a03465d8f..000000000 --- a/birdhouse/config/portainer/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/portainer/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/portainer:ro diff --git a/birdhouse/config/raven/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/raven/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index d0d300e97..000000000 --- a/birdhouse/config/raven/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/raven/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/raven/config/magpie/docker-compose-extra.yml b/birdhouse/config/raven/config/magpie/docker-compose-extra.yml deleted file mode 100644 index b870df7a2..000000000 --- a/birdhouse/config/raven/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/raven/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/raven-providers.cfg:ro diff --git a/birdhouse/config/thredds/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/thredds/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 1a50cc3d0..000000000 --- a/birdhouse/config/thredds/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/thredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml b/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml deleted file mode 100644 index 0d9a26632..000000000 --- a/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/thredds/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/thredds-providers.cfg:ro diff --git a/birdhouse/config/thredds/config/proxy/docker-compose-extra.yml b/birdhouse/config/thredds/config/proxy/docker-compose-extra.yml deleted file mode 100644 index 6bcb99497..000000000 --- a/birdhouse/config/thredds/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/thredds/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/thredds:ro - links: - - thredds diff --git a/birdhouse/config/twitcher/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/twitcher/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 44335000d..000000000 --- a/birdhouse/config/twitcher/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/twitcher/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/twitcher_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/twitcher/config/proxy/docker-compose-extra.yml b/birdhouse/config/twitcher/config/proxy/docker-compose-extra.yml deleted file mode 100644 index a03dcd41a..000000000 --- a/birdhouse/config/twitcher/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/twitcher/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/twitcher:ro diff --git a/birdhouse/config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index d95b8a227..000000000 --- a/birdhouse/config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/wps_outputs-volume_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/wps_outputs-volume/config/proxy/docker-compose-extra.yml b/birdhouse/config/wps_outputs-volume/config/proxy/docker-compose-extra.yml deleted file mode 100644 index faf961162..000000000 --- a/birdhouse/config/wps_outputs-volume/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/wps_outputs-volume/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/wps_outputs-volume:ro - - wps_outputs:/data/wps_outputs diff --git a/birdhouse/default.env b/birdhouse/default.env index 086885ca3..1db0e7f32 100644 --- a/birdhouse/default.env +++ b/birdhouse/default.env @@ -44,17 +44,11 @@ or a custom web interface. " export DEFAULT_CONF_DIRS=' - ./config/proxy - ./config/canarie-api - ./config/geoserver - ./config/finch - ./config/raven - ./config/hummingbird - ./config/thredds - ./config/portainer - ./config/magpie - ./config/twitcher - ./config/jupyterhub + ./components/proxy + ./components/magpie + ./components/twitcher + ./components/cowbird + ./components/stac ' export USER_WORKSPACE_UID=1000 diff --git a/birdhouse/deprecated-components/catalog/default.env b/birdhouse/deprecated-components/catalog/default.env index baaa58bc1..c96f2ee2f 100644 --- a/birdhouse/deprecated-components/catalog/default.env +++ b/birdhouse/deprecated-components/catalog/default.env @@ -35,5 +35,5 @@ OPTIONAL_VARS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/postgres + ./components/postgres " diff --git a/birdhouse/deprecated-components/flyingpigeon/default.env b/birdhouse/deprecated-components/flyingpigeon/default.env index 4a842692d..7d6e9cc4c 100644 --- a/birdhouse/deprecated-components/flyingpigeon/default.env +++ b/birdhouse/deprecated-components/flyingpigeon/default.env @@ -14,8 +14,8 @@ export WEAVER_WPS_PROVIDERS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/postgres - ./config/wps_outputs-volume + ./components/postgres + ./components/wps_outputs-volume " OPTIONAL_VARS=" diff --git a/birdhouse/deprecated-components/frontend/default.env b/birdhouse/deprecated-components/frontend/default.env index 9785330d5..ebdd08354 100644 --- a/birdhouse/deprecated-components/frontend/default.env +++ b/birdhouse/deprecated-components/frontend/default.env @@ -1,7 +1,7 @@ # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/ncwms2 - ./config/catalog - ./config/malleefowl + ./components/ncwms2 + ./components/catalog + ./components/malleefowl " diff --git a/birdhouse/deprecated-components/malleefowl/default.env b/birdhouse/deprecated-components/malleefowl/default.env index bc700764d..c69065bb2 100644 --- a/birdhouse/deprecated-components/malleefowl/default.env +++ b/birdhouse/deprecated-components/malleefowl/default.env @@ -15,9 +15,9 @@ export WEAVER_WPS_PROVIDERS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/postgres - ./config/wps_outputs-volume - ./config/data-volume + ./components/postgres + ./components/wps_outputs-volume + ./components/data-volume " OPTIONAL_VARS=" diff --git a/birdhouse/deprecated-components/ncops/default.env b/birdhouse/deprecated-components/ncops/default.env index 44882393d..d6453409b 100644 --- a/birdhouse/deprecated-components/ncops/default.env +++ b/birdhouse/deprecated-components/ncops/default.env @@ -1,5 +1,5 @@ # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/geoserver + ./components/geoserver " diff --git a/birdhouse/deprecated-components/ncwms2/default.env b/birdhouse/deprecated-components/ncwms2/default.env index e49476b92..07339c1a9 100644 --- a/birdhouse/deprecated-components/ncwms2/default.env +++ b/birdhouse/deprecated-components/ncwms2/default.env @@ -13,5 +13,5 @@ OPTIONAL_VARS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/wps_outputs-volume + ./components/wps_outputs-volume " diff --git a/birdhouse/deprecated-components/phoenix/default.env b/birdhouse/deprecated-components/phoenix/default.env index abda35660..c503d81f4 100644 --- a/birdhouse/deprecated-components/phoenix/default.env +++ b/birdhouse/deprecated-components/phoenix/default.env @@ -18,9 +18,9 @@ OPTIONAL_VARS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/malleefowl - ./config/flyingpigeon - ./config/catalog - ./config/proxy - ./config/mongodb + ./components/malleefowl + ./components/flyingpigeon + ./components/catalog + ./components/proxy + ./components/mongodb " diff --git a/birdhouse/deprecated-components/project-api/default.env b/birdhouse/deprecated-components/project-api/default.env index 88f68e2d1..d38312d15 100644 --- a/birdhouse/deprecated-components/project-api/default.env +++ b/birdhouse/deprecated-components/project-api/default.env @@ -2,5 +2,5 @@ # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/postgres + ./components/postgres " diff --git a/birdhouse/deprecated-components/project-api/docker-compose-extra.yml b/birdhouse/deprecated-components/project-api/docker-compose-extra.yml index 3f3545f82..7053da9f6 100644 --- a/birdhouse/deprecated-components/project-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/project-api/docker-compose-extra.yml @@ -18,6 +18,6 @@ services: links: - postgres env_file: - - ./config/postgres/credentials.env + - ./components/postgres/credentials.env restart: always logging: *default-logging diff --git a/birdhouse/env.local.example b/birdhouse/env.local.example index 402e4dddf..02b4a5c7f 100644 --- a/birdhouse/env.local.example +++ b/birdhouse/env.local.example @@ -81,6 +81,17 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass # #export EXTRA_CONF_DIRS="/path/to/dir1 ./path/to/dir2 dir3 dir4" #export EXTRA_CONF_DIRS=" +# ./components/canarie-api +# ./components/geoserver +# ./components/finch +# ./components/raven +# ./components/hummingbird +# ./components/thredds +# ./components/portainer +# ./components/jupyterhub +# ./components/monitoring +# ./components/weaver +# ./components/scheduler # ./optional-components/canarie-api-full-monitoring # ./optional-components/emu # ./optional-components/testthredds @@ -91,10 +102,6 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass # ./optional-components/wps-healthchecks # ./optional-components/test-weaver # ./optional-components/test-geoserver-secured-access -# ./components/scheduler -# ./components/monitoring -# ./components/weaver -# ./components/cowbird # /path/to/private-config-repo #" @@ -224,7 +231,10 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass # Content of "location /" in file config/proxy/conf.d/all-services.include.template # Useful to have a custom homepage. # Default: -#export PROXY_ROOT_LOCATION="return 302 https://\$host/jupyter/hub/login;" +#export PROXY_ROOT_LOCATION="return 302 https://\$host/magpie;" +# Note that the default homepage will become the jupyterhub login page if the jupyterhub component is enabled. +# If the jupyterhub component is not enabled, it is highly recommended to create a custom homepage since the magpie +# landing page is not the most user-friendly option. # Sample, remember to add this /data/homepage volume mount to proxy container. # See PR https://github.com/bird-house/birdhouse-deploy-ouranos/pull/11. #export PROXY_ROOT_LOCATION="alias /data/homepage/;" @@ -437,7 +447,7 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass #export THREDDS_SERVICE_DATA_URL_PATH='birdhouse' # this default is for backward compatibility # Additional catalogs for THREDDS. Add as many datasetScan XML blocks as needed to THREDDS_ADDITIONAL_CATALOG. -# Each block defines a new top-level catalog. See birdhouse/config/thredds/catalog.xml.template for more information. +# Each block defines a new top-level catalog. See birdhouse/components/thredds/catalog.xml.template for more information. export THREDDS_ADDITIONAL_CATALOG="" #export THREDDS_ADDITIONAL_CATALOG=" # diff --git a/birdhouse/optional-components/all-public-access/default.env b/birdhouse/optional-components/all-public-access/default.env index 1dfd6f35b..9eb12ec26 100644 --- a/birdhouse/optional-components/all-public-access/default.env +++ b/birdhouse/optional-components/all-public-access/default.env @@ -2,5 +2,5 @@ # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/magpie + ./components/magpie " diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/default.env b/birdhouse/optional-components/canarie-api-full-monitoring/default.env index 3e931ea94..3a763ed75 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/default.env +++ b/birdhouse/optional-components/canarie-api-full-monitoring/default.env @@ -2,5 +2,5 @@ # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/canarie-api + ./components/canarie-api " diff --git a/birdhouse/optional-components/emu/default.env b/birdhouse/optional-components/emu/default.env index d5f373cbc..7ff1ce2b5 100644 --- a/birdhouse/optional-components/emu/default.env +++ b/birdhouse/optional-components/emu/default.env @@ -25,6 +25,6 @@ OPTIONAL_VARS=" # add any component that this component requires to run if [ "$EMU_WPS_OUTPUTS_VOL" == 'wps_outputs' ]; then COMPONENT_DEPENDENCIES=" - ./config/wps_outputs-volume + ./components/wps_outputs-volume " fi diff --git a/birdhouse/optional-components/generic_bird/default.env b/birdhouse/optional-components/generic_bird/default.env index c59e7fd05..451862382 100644 --- a/birdhouse/optional-components/generic_bird/default.env +++ b/birdhouse/optional-components/generic_bird/default.env @@ -20,5 +20,5 @@ OPTIONAL_VARS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/wps_outputs-volume + ./components/wps_outputs-volume " diff --git a/birdhouse/optional-components/generic_bird/docker-compose-extra.yml b/birdhouse/optional-components/generic_bird/docker-compose-extra.yml index 6e4cd4460..16dfff1dd 100644 --- a/birdhouse/optional-components/generic_bird/docker-compose-extra.yml +++ b/birdhouse/optional-components/generic_bird/docker-compose-extra.yml @@ -21,7 +21,7 @@ services: environment: PGDATA: /var/lib/postgresql/data/pgdata env_file: - - ./config/postgres/credentials.env + - ./components/postgres/credentials.env restart: always volumes: diff --git a/birdhouse/optional-components/secure-data-proxy/default.env b/birdhouse/optional-components/secure-data-proxy/default.env index 2a8bfbb4d..d1dc388c3 100644 --- a/birdhouse/optional-components/secure-data-proxy/default.env +++ b/birdhouse/optional-components/secure-data-proxy/default.env @@ -19,8 +19,8 @@ export SECURE_DATA_PROXY_AUTH_INCLUDE="include /etc/nginx/conf.extra-service.d/s # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/magpie - ./config/twitcher - ./config/proxy - ./config/wps_outputs-volume + ./components/magpie + ./components/twitcher + ./components/proxy + ./components/wps_outputs-volume " diff --git a/birdhouse/optional-components/secure-thredds/default.env b/birdhouse/optional-components/secure-thredds/default.env index 9e9feee5d..c9b6f9905 100644 --- a/birdhouse/optional-components/secure-thredds/default.env +++ b/birdhouse/optional-components/secure-thredds/default.env @@ -1,5 +1,5 @@ # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/magpie - ./config/thredds + ./components/magpie + ./components/thredds " diff --git a/birdhouse/optional-components/test-geoserver-secured-access/default.env b/birdhouse/optional-components/test-geoserver-secured-access/default.env index ec638ed1e..1dcf99aaf 100644 --- a/birdhouse/optional-components/test-geoserver-secured-access/default.env +++ b/birdhouse/optional-components/test-geoserver-secured-access/default.env @@ -1,6 +1,6 @@ # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/magpie - ./config/proxy - ./config/geoserver + ./components/magpie + ./components/proxy + ./components/geoserver " diff --git a/birdhouse/optional-components/test-weaver/default.env b/birdhouse/optional-components/test-weaver/default.env index 5671015ab..8b8de5933 100644 --- a/birdhouse/optional-components/test-weaver/default.env +++ b/birdhouse/optional-components/test-weaver/default.env @@ -1,5 +1,5 @@ # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/magpie + ./components/magpie ./components/weaver " diff --git a/birdhouse/optional-components/testthredds/default.env b/birdhouse/optional-components/testthredds/default.env index 40b7fc907..25dea9e9b 100644 --- a/birdhouse/optional-components/testthredds/default.env +++ b/birdhouse/optional-components/testthredds/default.env @@ -26,5 +26,5 @@ OPTIONAL_VARS=" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/thredds + ./components/thredds " diff --git a/birdhouse/optional-components/x-robots-tag-header/default.env b/birdhouse/optional-components/x-robots-tag-header/default.env index 709cfdf8f..9209e212e 100644 --- a/birdhouse/optional-components/x-robots-tag-header/default.env +++ b/birdhouse/optional-components/x-robots-tag-header/default.env @@ -9,7 +9,7 @@ export X_ROBOTS_TAG_HEADER="noindex, nofollow" # add any component that this component requires to run COMPONENT_DEPENDENCIES=" - ./config/proxy + ./components/proxy " # add vars only needed to be substituted in templates diff --git a/birdhouse/pavics-compose.sh b/birdhouse/pavics-compose.sh index 1858de2f3..44636ea51 100755 --- a/birdhouse/pavics-compose.sh +++ b/birdhouse/pavics-compose.sh @@ -129,7 +129,7 @@ do # run postgres post-startup setup script # Note: this must run before the post-docker-compose-up scripts since some may expect postgres databases to exist - postgres_id=$(PROXY_SECURE_PORT=443 HOSTNAME=${PAVICS_FQDN} docker-compose ${COMPOSE_CONF_LIST} ps -q postgres) + postgres_id=$(PROXY_SECURE_PORT=443 HOSTNAME=${PAVICS_FQDN} docker-compose ${COMPOSE_CONF_LIST} ps -q postgres 2> /dev/null) if [ ! -z "$postgres_id" ]; then docker exec ${postgres_id} /postgres-setup.sh fi diff --git a/birdhouse/read-configs.include.sh b/birdhouse/read-configs.include.sh index 85f4950dc..2173e18ca 100644 --- a/birdhouse/read-configs.include.sh +++ b/birdhouse/read-configs.include.sh @@ -196,7 +196,7 @@ process_delayed_eval() { # variable (set using the read_components_default_env function). # The file order is determined by the order of the config directories in ALL_CONF_DIRS. # If a config directory also includes an override file for another component -# (eg: ./config/finch/config/proxy/docker-compose-extra.yml overrides ./config/proxy/docker-compose-extra.yml), +# (eg: ./components/finch/config/proxy/docker-compose-extra.yml overrides ./components/proxy/docker-compose-extra.yml), # the following additional order rules apply: # # - if the component that is being overridden has already been added, the override file is added immediately diff --git a/birdhouse/scripts/get-components-json.include.sh b/birdhouse/scripts/get-components-json.include.sh index c3cc13d11..bf8679e3b 100755 --- a/birdhouse/scripts/get-components-json.include.sh +++ b/birdhouse/scripts/get-components-json.include.sh @@ -35,7 +35,7 @@ cd "${BIRDHOUSE_DEPLOY_COMPONENTS_ROOT}" || true # ignore error for now, empty # note: no quotes in 'ls' on purpose to expand glob patterns BIRDHOUSE_DEPLOY_COMPONENTS_LIST_KNOWN="$( \ - ls -d1 ./*components/*/ ./config/*/ 2>/dev/null \ + ls -d1 ./*components/*/ 2>/dev/null \ | sed -E "s|\./(.*)/|\1|" \ | sed -E '/^[[:space:]]*$/d' \ | sed -E 's/^|[[:space:]]+/ -e /' \ diff --git a/birdhouse/templates/docker-compose.override.public_thredds.yml b/birdhouse/templates/docker-compose.override.public_thredds.yml index 12477c95d..124823bb0 100644 --- a/birdhouse/templates/docker-compose.override.public_thredds.yml +++ b/birdhouse/templates/docker-compose.override.public_thredds.yml @@ -3,4 +3,4 @@ services: thredds: volumes: - ${PATH_TO_LOCAL_NETCDF_FILES}:${THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER} - - ./config/thredds/catalog-public.xml:/opt/birdhouse/eggs/birdhousebuilder.recipe.thredds-0.3.0-py2.7.egg/birdhousebuilder/recipe/thredds/catalog.xml + - ./components/thredds/catalog-public.xml:/opt/birdhouse/eggs/birdhousebuilder.recipe.thredds-0.3.0-py2.7.egg/birdhousebuilder/recipe/thredds/catalog.xml diff --git a/docs/source/conf.py b/docs/source/conf.py index ac8909bd6..53b636c92 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.42.2' +version = '2.0.0' # The full version, including alpha/beta/rc tags. -release = '1.42.2' +release = '2.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tests/pytest.ini b/tests/pytest.ini new file mode 100644 index 000000000..011041079 --- /dev/null +++ b/tests/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +markers = + online: marks test as requiring access to the internet (to skip these tests: '-m "not online"') diff --git a/tests/test_read_configs_include.py b/tests/test_read_configs_include.py index 772740408..646b5d604 100644 --- a/tests/test_read_configs_include.py +++ b/tests/test_read_configs_include.py @@ -52,24 +52,37 @@ class TestReadConfigs: test_func: str = " read_components_default_env" default_all_conf_order: list[str] = [ - "./config/proxy", - "./config/canarie-api", - "./config/geoserver", - "./config/wps_outputs-volume", - "./config/postgres", - "./config/finch", - "./config/raven", - "./config/data-volume", - "./config/hummingbird", - "./config/thredds", - "./config/portainer", - "./config/magpie", - "./config/twitcher", - "./config/jupyterhub" + "./components/proxy", + "./components/magpie", + "./components/twitcher", + "./components/cowbird", + "./components/stac", + ] + + default_all_conf_order_with_dependencies: list[str] = [ + "./components/proxy", + "./components/magpie", + "./components/twitcher", + "./components/wps_outputs-volume", + "./components/cowbird", + "./components/stac", + ] + + extra_conf_order: list[str] = [ + "./components/canarie-api", + "./components/geoserver", + "./components/wps_outputs-volume", + "./components/postgres", + "./components/finch", + "./components/raven", + "./components/data-volume", + "./components/hummingbird", + "./components/thredds", + "./components/jupyterhub" ] def run_func( - self, include_file: str, local_env: str | dict, command_suffix: str = "" + self, include_file: str, local_env: str | dict, command_suffix: str = "" ) -> subprocess.CompletedProcess: try: with tempfile.NamedTemporaryFile(delete=False, mode="w") as f: @@ -113,14 +126,14 @@ def test_all_conf_dirs_default_order(self, read_config_include_file) -> None: """Test that the expected order that default.env files are loaded is correct""" proc = self.run_func(read_config_include_file, {}, 'echo "$ALL_CONF_DIRS"') print(proc.stdout) # useful for debugging when assert fail - assert split_and_strip(get_command_stdout(proc)) == self.default_all_conf_order + assert split_and_strip(get_command_stdout(proc)) == self.default_all_conf_order_with_dependencies def test_all_conf_dirs_extra_last(self, read_config_include_file) -> None: """Test that any extra components are loaded last""" - extra = {"EXTRA_CONF_DIRS": '"./components/cowbird\n./components/weaver"'} + extra = {"EXTRA_CONF_DIRS": '"./components/finch\n./components/weaver"'} proc = self.run_func(read_config_include_file, extra, 'echo "$ALL_CONF_DIRS"') assert split_and_strip(get_command_stdout(proc))[-2:] == [ - "./components/cowbird", + "./components/finch", "./components/weaver", ] @@ -144,7 +157,8 @@ def test_non_project_components_included(self, read_config_include_file) -> None @pytest.mark.usefixtures("run_in_compose_dir") def test_delayed_eval_default_value(self, read_config_include_file) -> None: """Test delayed eval when value not set in env.local""" - extra = {"PAVICS_FQDN": '"fqdn.example.com"'} + extra = {"PAVICS_FQDN": '"fqdn.example.com"', + "EXTRA_CONF_DIRS": '"./components/jupyterhub ./components/geoserver"'} proc = self.run_func(read_config_include_file, extra, 'echo "$PAVICS_FQDN_PUBLIC - $JUPYTERHUB_USER_DATA_DIR - $GEOSERVER_DATA_DIR"') print(proc.stdout) # useful for debugging when assert fail @@ -157,6 +171,7 @@ def test_delayed_eval_custom_value(self, read_config_include_file) -> None: """Test delayed eval when value is set in env.local""" extra = {"PAVICS_FQDN": '"fqdn.example.com"', "PAVICS_FQDN_PUBLIC": '"public.example.com"', + "EXTRA_CONF_DIRS": '"./components/jupyterhub ./components/geoserver"', "DATA_PERSIST_ROOT": '"/my-data-root"', # indirectly change JUPYTERHUB_USER_DATA_DIR "GEOSERVER_DATA_DIR": '"/my-geoserver-data"', } @@ -171,46 +186,55 @@ def test_delayed_eval_custom_value(self, read_config_include_file) -> None: class TestCreateComposeConfList: default_conf_list_order: list[str] = [ "docker-compose.yml", - "./config/proxy/docker-compose-extra.yml", - "./config/canarie-api/config/proxy/docker-compose-extra.yml", - "./config/geoserver/docker-compose-extra.yml", - "./config/geoserver/config/canarie-api/docker-compose-extra.yml", - "./config/geoserver/config/proxy/docker-compose-extra.yml", - "./config/wps_outputs-volume/docker-compose-extra.yml", - "./config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml", - "./config/wps_outputs-volume/config/proxy/docker-compose-extra.yml", - "./config/postgres/docker-compose-extra.yml", - "./config/finch/docker-compose-extra.yml", - "./config/finch/config/canarie-api/docker-compose-extra.yml", - "./config/finch/config/wps_outputs-volume/docker-compose-extra.yml", - "./config/raven/docker-compose-extra.yml", - "./config/raven/config/canarie-api/docker-compose-extra.yml", - "./config/raven/config/wps_outputs-volume/docker-compose-extra.yml", - "./config/data-volume/docker-compose-extra.yml", - "./config/hummingbird/docker-compose-extra.yml", - "./config/hummingbird/config/canarie-api/docker-compose-extra.yml", - "./config/hummingbird/config/data-volume/docker-compose-extra.yml", - "./config/hummingbird/config/wps_outputs-volume/docker-compose-extra.yml", - "./config/thredds/docker-compose-extra.yml", - "./config/thredds/config/canarie-api/docker-compose-extra.yml", - "./config/thredds/config/proxy/docker-compose-extra.yml", - "./config/portainer/docker-compose-extra.yml", - "./config/portainer/config/proxy/docker-compose-extra.yml", - "./config/magpie/docker-compose-extra.yml", - "./config/geoserver/config/magpie/docker-compose-extra.yml", - "./config/finch/config/magpie/docker-compose-extra.yml", - "./config/raven/config/magpie/docker-compose-extra.yml", - "./config/hummingbird/config/magpie/docker-compose-extra.yml", - "./config/thredds/config/magpie/docker-compose-extra.yml", - "./config/magpie/config/canarie-api/docker-compose-extra.yml", - "./config/magpie/config/proxy/docker-compose-extra.yml", - "./config/twitcher/docker-compose-extra.yml", - "./config/twitcher/config/canarie-api/docker-compose-extra.yml", - "./config/twitcher/config/proxy/docker-compose-extra.yml", - "./config/jupyterhub/docker-compose-extra.yml", - "./config/jupyterhub/config/canarie-api/docker-compose-extra.yml", - "./config/jupyterhub/config/magpie/docker-compose-extra.yml", - "./config/jupyterhub/config/proxy/docker-compose-extra.yml", + "./components/proxy/docker-compose-extra.yml", + "./components/magpie/docker-compose-extra.yml", + "./components/magpie/config/proxy/docker-compose-extra.yml", + "./components/twitcher/docker-compose-extra.yml", + "./components/twitcher/config/proxy/docker-compose-extra.yml", + "./components/cowbird/docker-compose-extra.yml", + "./components/cowbird/config/magpie/docker-compose-extra.yml", + "./components/cowbird/config/proxy/docker-compose-extra.yml", + "./components/stac/docker-compose-extra.yml", + "./components/stac/config/magpie/docker-compose-extra.yml", + "./components/stac/config/proxy/docker-compose-extra.yml", + "./components/stac/config/twitcher/docker-compose-extra.yml", + "./components/magpie/config/canarie-api/docker-compose-extra.yml", + "./components/twitcher/config/canarie-api/docker-compose-extra.yml", + "./components/cowbird/config/canarie-api/docker-compose-extra.yml", + "./components/stac/config/canarie-api/docker-compose-extra.yml", + "./components/canarie-api/config/proxy/docker-compose-extra.yml", + "./components/geoserver/docker-compose-extra.yml", + "./components/cowbird/config/geoserver/docker-compose-extra.yml", + "./components/geoserver/config/canarie-api/docker-compose-extra.yml", + "./components/geoserver/config/magpie/docker-compose-extra.yml", + "./components/geoserver/config/proxy/docker-compose-extra.yml", + "./components/wps_outputs-volume/docker-compose-extra.yml", + "./components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml", + "./components/wps_outputs-volume/config/proxy/docker-compose-extra.yml", + "./components/postgres/docker-compose-extra.yml", + "./components/finch/docker-compose-extra.yml", + "./components/finch/config/canarie-api/docker-compose-extra.yml", + "./components/finch/config/magpie/docker-compose-extra.yml", + "./components/finch/config/wps_outputs-volume/docker-compose-extra.yml", + "./components/raven/docker-compose-extra.yml", + "./components/raven/config/canarie-api/docker-compose-extra.yml", + "./components/raven/config/magpie/docker-compose-extra.yml", + "./components/raven/config/wps_outputs-volume/docker-compose-extra.yml", + "./components/data-volume/docker-compose-extra.yml", + "./components/hummingbird/docker-compose-extra.yml", + "./components/hummingbird/config/canarie-api/docker-compose-extra.yml", + "./components/hummingbird/config/data-volume/docker-compose-extra.yml", + "./components/hummingbird/config/magpie/docker-compose-extra.yml", + "./components/hummingbird/config/wps_outputs-volume/docker-compose-extra.yml", + "./components/thredds/docker-compose-extra.yml", + "./components/thredds/config/canarie-api/docker-compose-extra.yml", + "./components/thredds/config/magpie/docker-compose-extra.yml", + "./components/thredds/config/proxy/docker-compose-extra.yml", + "./components/jupyterhub/docker-compose-extra.yml", + "./components/cowbird/config/jupyterhub/docker-compose-extra.yml", + "./components/jupyterhub/config/canarie-api/docker-compose-extra.yml", + "./components/jupyterhub/config/magpie/docker-compose-extra.yml", + "./components/jupyterhub/config/proxy/docker-compose-extra.yml" ] def run_func(self, include_file: str, local_env: dict, command_suffix: str = "") -> subprocess.CompletedProcess: @@ -241,23 +265,26 @@ def test_all_conf_dirs_empty(self, read_config_include_file): def test_compose_no_overrides(self, read_config_include_file): """Test that COMPOSE_CONF_LIST is set correctly when there are no overrides""" proc = self.run_func( - read_config_include_file, {"ALL_CONF_DIRS": "./config/finch ./config/raven"}, 'echo "$COMPOSE_CONF_LIST"' + read_config_include_file, {"ALL_CONF_DIRS": "./components/finch ./components/raven"}, + 'echo "$COMPOSE_CONF_LIST"' ) print(proc.stdout) # useful for debugging when assert fail assert split_and_strip(get_command_stdout(proc), split_on="-f") == [ "docker-compose.yml", - "./config/finch/docker-compose-extra.yml", - "./config/raven/docker-compose-extra.yml", + "./components/finch/docker-compose-extra.yml", + "./components/raven/docker-compose-extra.yml", ] def test_compose_in_order(self, read_config_include_file): """Test that the order of ALL_CONF_DIRS is respected""" proc1 = self.run_func( - read_config_include_file, {"ALL_CONF_DIRS": "./config/finch ./config/raven"}, 'echo "$COMPOSE_CONF_LIST"' + read_config_include_file, {"ALL_CONF_DIRS": "./components/finch ./components/raven"}, + 'echo "$COMPOSE_CONF_LIST"' ) out1 = split_and_strip(get_command_stdout(proc1), split_on="-f") proc2 = self.run_func( - read_config_include_file, {"ALL_CONF_DIRS": "./config/raven ./config/finch"}, 'echo "$COMPOSE_CONF_LIST"' + read_config_include_file, {"ALL_CONF_DIRS": "./components/raven ./components/finch"}, + 'echo "$COMPOSE_CONF_LIST"' ) out2 = split_and_strip(get_command_stdout(proc2), split_on="-f") assert out1 == out2[:1] + out2[:0:-1] @@ -266,21 +293,22 @@ def test_compose_in_order(self, read_config_include_file): def test_compose_overrides(self, read_config_include_file): """Test that COMPOSE_CONF_LIST is set correctly when there are overrides""" proc = self.run_func( - read_config_include_file, {"ALL_CONF_DIRS": "./config/finch ./config/magpie"}, 'echo "$COMPOSE_CONF_LIST"' + read_config_include_file, {"ALL_CONF_DIRS": "./components/finch ./components/magpie"}, + 'echo "$COMPOSE_CONF_LIST"' ) print(proc.stdout) # useful for debugging when assert fail assert split_and_strip(get_command_stdout(proc), split_on="-f") == [ "docker-compose.yml", - "./config/finch/docker-compose-extra.yml", - "./config/magpie/docker-compose-extra.yml", - "./config/finch/config/magpie/docker-compose-extra.yml", + "./components/finch/docker-compose-extra.yml", + "./components/magpie/docker-compose-extra.yml", + "./components/finch/config/magpie/docker-compose-extra.yml", ] @pytest.mark.usefixtures("run_in_compose_dir") def test_default_all_conf_dirs(self, read_config_include_file): proc = self.run_func( read_config_include_file, - {"ALL_CONF_DIRS": " ".join(TestReadConfigs.default_all_conf_order)}, + {"ALL_CONF_DIRS": " ".join(TestReadConfigs.default_all_conf_order + TestReadConfigs.extra_conf_order)}, 'echo "$COMPOSE_CONF_LIST"', ) print(proc.stdout) # useful for debugging when assert fail