diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4d20fa1e5..2dae9d025 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.26.11 +current_version = 1.27.0 commit = True tag = False tag_name = {new_version} @@ -30,11 +30,11 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2023-07-04T12:57:39Z +search = {current_version} 2023-07-06T16:40:21Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-07-04T12:57:39Z +values = 2023-07-06T16:40:21Z [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 9a8537b10..a602d25ac 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,14 @@ [//]: # (list changes here, using '-' for each new entry, remove this when items are added) +[1.27.0](https://github.com/bird-house/birdhouse-deploy/tree/1.27.0) (2023-07-06) +------------------------------------------------------------------------------------------------------------------ + +- Deprecate unused/unmaintained components + + Move unused and unmaintained components to a separate [`deprecated-components/`](birdhouse/deprecated-components) + subdirectory and remove them from the `DEFAULT_CONF_DIRS` list if required. + [1.26.11](https://github.com/bird-house/birdhouse-deploy/tree/1.26.11) (2023-07-04) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index 9103091df..72842eb30 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.26.11 +override APP_VERSION := 1.27.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 ecfbb9b4a..6e42af018 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.26.11.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.27.0.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.26.11...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.27.0...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.26.11-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.27.0-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.26.11 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.27.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 374510a3a..871a05de7 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.26.11 2023-07-04T12:57:39Z +1.27.0 2023-07-06T16:40:21Z diff --git a/birdhouse/components/cowbird/.gitignore b/birdhouse/components/cowbird/.gitignore index e553e9cbf..d6bf1922d 100644 --- a/birdhouse/components/cowbird/.gitignore +++ b/birdhouse/components/cowbird/.gitignore @@ -3,8 +3,9 @@ config/cowbird/config.yml config/cowbird/cowbird.ini config/magpie/config.yml config/proxy/conf.extra-service.d/cowbird.conf -config/proxy/canarie_api_monitoring.py +config/canarie-api/canarie_api_monitoring.py # Old paths. Keep these so that old config files remain uncommittable after updates. conf.extra-service.d/cowbird.conf config/canarie-api/cowbird_config.py +config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/components/cowbird/default.env b/birdhouse/components/cowbird/default.env index 698456144..8fa0906c0 100644 --- a/birdhouse/components/cowbird/default.env +++ b/birdhouse/components/cowbird/default.env @@ -36,3 +36,10 @@ export COWBIRD_MONGODB_PORT=27017 # Subdirectory containing the user workspaces used by Cowbird export USER_WORKSPACES="user_workspaces" + +# this dependency is only required if COWBIRD_MONGODB_SERVICE is the one provided in config/mongodb. +# (include this by default to support backwards compatibility for now) +COMPONENT_DEPENDENCIES=" + $COMPONENT_DEPENDENCIES + ./config/mongodb +" diff --git a/birdhouse/config/.gitignore b/birdhouse/config/.gitignore index b8975a7a1..9cdea33e9 100644 --- a/birdhouse/config/.gitignore +++ b/birdhouse/config/.gitignore @@ -1,2 +1,10 @@ # Old paths. Keep these so that old config files remain uncommittable after updates. postgres-magpie/ +catalog/ +frontend/ +malleefowl/ +ncops/ +ncwms2/ +project-api/ +solr/ +phoenix/ diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index 1e9726c4c..f65125827 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/config/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.26.11', - 'releaseTime': '2023-07-04T12:57:39Z', + 'version': '1.27.0', + 'releaseTime': '2023-07-06T16:40:21Z', '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.26.11', - 'releaseTime': '2023-07-04T12:57:39Z', + 'version': '1.27.0', + 'releaseTime': '2023-07-06T16:40:21Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/birdhouse/config/catalog/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/catalog/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 3c3e43c4a..000000000 --- a/birdhouse/config/catalog/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/catalog/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/catalog_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/catalog/config/magpie/docker-compose-extra.yml b/birdhouse/config/catalog/config/magpie/docker-compose-extra.yml deleted file mode 100644 index 0400e09b7..000000000 --- a/birdhouse/config/catalog/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/catalog/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/catalog-providers.cfg:ro - - ./config/catalog/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/catalog-permissions.cfg:ro diff --git a/birdhouse/config/frontend/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/frontend/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index bd6181009..000000000 --- a/birdhouse/config/frontend/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/frontend/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/frontend_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/frontend/config/proxy/docker-compose-extra.yml b/birdhouse/config/frontend/config/proxy/docker-compose-extra.yml deleted file mode 100644 index 740a71e74..000000000 --- a/birdhouse/config/frontend/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/frontend/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/frontend:ro diff --git a/birdhouse/config/malleefowl/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/malleefowl/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 380d5175d..000000000 --- a/birdhouse/config/malleefowl/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/malleefowl/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/malleefowl_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/malleefowl/config/magpie/docker-compose-extra.yml b/birdhouse/config/malleefowl/config/magpie/docker-compose-extra.yml deleted file mode 100644 index b5181f0e9..000000000 --- a/birdhouse/config/malleefowl/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/malleefowl/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/malleefowl-providers.cfg:ro diff --git a/birdhouse/config/ncwms2/config/magpie/docker-compose-extra.yml b/birdhouse/config/ncwms2/config/magpie/docker-compose-extra.yml deleted file mode 100644 index 72e8cff39..000000000 --- a/birdhouse/config/ncwms2/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/ncwms2/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/ncwms2-providers.cfg:ro diff --git a/birdhouse/config/ncwms2/config/proxy/docker-compose-extra.yml b/birdhouse/config/ncwms2/config/proxy/docker-compose-extra.yml deleted file mode 100644 index 06515b694..000000000 --- a/birdhouse/config/ncwms2/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/ncwms2/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/ncwms2:ro diff --git a/birdhouse/config/phoenix/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/phoenix/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 6e839432c..000000000 --- a/birdhouse/config/phoenix/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/phoenix/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/phoenix_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/project-api/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/project-api/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index e4ec2da99..000000000 --- a/birdhouse/config/project-api/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/project-api/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/project-api_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/project-api/config/proxy/docker-compose-extra.yml b/birdhouse/config/project-api/config/proxy/docker-compose-extra.yml deleted file mode 100644 index 3f303f336..000000000 --- a/birdhouse/config/project-api/config/proxy/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/project-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/project-api:ro diff --git a/birdhouse/config/solr/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/solr/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 322b3a6da..000000000 --- a/birdhouse/config/solr/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/solr/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/solr_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/thredds/.gitignore b/birdhouse/config/thredds/.gitignore index bcc9b17a9..d3aea6bf5 100644 --- a/birdhouse/config/thredds/.gitignore +++ b/birdhouse/config/thredds/.gitignore @@ -3,6 +3,7 @@ threddsConfig.xml config/proxy/conf.extra-service.d/thredds.conf config/canarie-api/canarie_api_monitoring.py service-config.json +config/magpie/providers.cfg # Old paths. Keep these so that old config files remain uncommittable after updates. config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml b/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..0d9a26632 --- /dev/null +++ b/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +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/magpie/providers.cfg.template b/birdhouse/config/thredds/config/magpie/providers.cfg.template new file mode 100644 index 000000000..3ca5f9d84 --- /dev/null +++ b/birdhouse/config/thredds/config/magpie/providers.cfg.template @@ -0,0 +1,35 @@ +providers: + thredds: + url: http://thredds:8080/twitcher/ows/proxy/thredds + title: Thredds + public: true + c4i: false + type: thredds + sync_type: thredds + # below is a custom config to indicate how magpie should convert thredds path elements into resources/permissions + # see: https://pavics-magpie.readthedocs.io/en/latest/services.html#servicethredds + configuration: + skip_prefix: "thredds" # prefix to ignore, below prefixes will be matched against whatever comes after in path + file_patterns: + # note: make sure to employ quotes and double escapes to avoid parsing YAML error + - ".+\\.ncml" # match longest extension first to avoid tuncating it by match of sorter '.nc' + - ".+\\.nc" + metadata_type: + prefixes: + - null # note: special YAML value evaluated as `no-prefix`, use quotes if literal value is needed + - "\\w+\\.gif" # threddsIcon, folder icon, etc. + - "\\w+\\.ico" # favicon + - "\\w+\\.txt" # licence + - "\\w+\\.css" # tds.css + - "catalog\\.\\w+" # note: special case for `THREDDS` top-level directory (root) accessed for `BROWSE` + - catalog + - ncml + - uddc + - iso + data_type: + prefixes: + - fileServer + - dodsC + - wcs + - wms + - ncss diff --git a/birdhouse/default.env b/birdhouse/default.env index e67028d34..30d778b1e 100644 --- a/birdhouse/default.env +++ b/birdhouse/default.env @@ -39,7 +39,6 @@ or a custom web interface. export DEFAULT_CONF_DIRS=' ./config/proxy ./config/canarie-api - ./config/phoenix ./config/geoserver ./config/flyingpigeon ./config/finch @@ -50,9 +49,4 @@ export DEFAULT_CONF_DIRS=' ./config/magpie ./config/twitcher ./config/jupyterhub - ./config/frontend - ./config/project-api - ./config/catalog - ./config/malleefowl - ./config/solr ' diff --git a/birdhouse/deprecated-components/README.rst b/birdhouse/deprecated-components/README.rst new file mode 100644 index 000000000..a4857d1f0 --- /dev/null +++ b/birdhouse/deprecated-components/README.rst @@ -0,0 +1,29 @@ +Deprecated Components +##################### + +.. contents:: + +All components in this directory are not actively maintained. + +If you wish to include these components in the deployed stack, additional work +may be required to make them compatible with the current stack. + +Components in this directory may be removed from this repository at any time. + +This directory also contains additional configurations for these deprecated components in: + +- `all-public-access-deprecated/` +- `canarie-api-full-monitoring-deprecated/` +- `wps-healthchecks-deprecated/` + +These contain the settings to extend the deprecated components that have been moved from the corresponding +directories under `birdhouse/optional-components`. + +To enable these additional configurations; add them to the `EXTRA_CONF_DIRS` variable (in `env.local`) +as you would to enable any component. For example, to enable the deprecated malleefowl component as well as the +wps-healthchecks for malleefowl. The `EXTRA_CONF_DIRS` variable should contain: + +.. code-block:: shell + + ./deprecated-components/malleefowl + ./wps-healthchecks-deprecated diff --git a/birdhouse/config/catalog/.gitignore b/birdhouse/deprecated-components/catalog/.gitignore similarity index 100% rename from birdhouse/config/catalog/.gitignore rename to birdhouse/deprecated-components/catalog/.gitignore diff --git a/birdhouse/config/catalog/catalog.cfg.template b/birdhouse/deprecated-components/catalog/catalog.cfg.template similarity index 100% rename from birdhouse/config/catalog/catalog.cfg.template rename to birdhouse/deprecated-components/catalog/catalog.cfg.template diff --git a/birdhouse/config/catalog/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/deprecated-components/catalog/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/catalog/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/deprecated-components/catalog/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..fd67d5eaf --- /dev/null +++ b/birdhouse/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/catalog/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/catalog_canarie_api_monitoring.py:ro diff --git a/birdhouse/deprecated-components/catalog/config/magpie/docker-compose-extra.yml b/birdhouse/deprecated-components/catalog/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..174f3613f --- /dev/null +++ b/birdhouse/deprecated-components/catalog/config/magpie/docker-compose-extra.yml @@ -0,0 +1,6 @@ +version: "3.4" +services: + magpie: + volumes: + - ./deprecated-components/catalog/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/catalog-providers.cfg:ro + - ./deprecated-components/catalog/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/catalog-permissions.cfg:ro diff --git a/birdhouse/config/catalog/config/magpie/permissions.cfg.template b/birdhouse/deprecated-components/catalog/config/magpie/permissions.cfg.template similarity index 100% rename from birdhouse/config/catalog/config/magpie/permissions.cfg.template rename to birdhouse/deprecated-components/catalog/config/magpie/permissions.cfg.template diff --git a/birdhouse/config/catalog/config/magpie/providers.cfg.template b/birdhouse/deprecated-components/catalog/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/catalog/config/magpie/providers.cfg.template rename to birdhouse/deprecated-components/catalog/config/magpie/providers.cfg.template diff --git a/birdhouse/config/catalog/default.env b/birdhouse/deprecated-components/catalog/default.env similarity index 100% rename from birdhouse/config/catalog/default.env rename to birdhouse/deprecated-components/catalog/default.env diff --git a/birdhouse/config/catalog/docker-compose-extra.yml b/birdhouse/deprecated-components/catalog/docker-compose-extra.yml similarity index 84% rename from birdhouse/config/catalog/docker-compose-extra.yml rename to birdhouse/deprecated-components/catalog/docker-compose-extra.yml index 8825c0b53..cc2a8cbff 100644 --- a/birdhouse/config/catalog/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/catalog/docker-compose-extra.yml @@ -14,7 +14,7 @@ services: ports: - "8086:80" volumes: - - ./config/catalog/catalog.cfg:/home/catalog.cfg + - ./deprecated-components/catalog/catalog.cfg:/home/catalog.cfg - wps_outputs:/var/www/html/wps_results depends_on: - postgres diff --git a/birdhouse/config/frontend/.gitignore b/birdhouse/deprecated-components/frontend/.gitignore similarity index 100% rename from birdhouse/config/frontend/.gitignore rename to birdhouse/deprecated-components/frontend/.gitignore diff --git a/birdhouse/config/frontend/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/deprecated-components/frontend/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/frontend/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/deprecated-components/frontend/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/deprecated-components/frontend/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/frontend/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..d45650da1 --- /dev/null +++ b/birdhouse/deprecated-components/frontend/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/frontend/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/frontend_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/frontend/config/proxy/conf.extra-service.d/frontend.conf.template b/birdhouse/deprecated-components/frontend/config/proxy/conf.extra-service.d/frontend.conf.template similarity index 100% rename from birdhouse/config/frontend/config/proxy/conf.extra-service.d/frontend.conf.template rename to birdhouse/deprecated-components/frontend/config/proxy/conf.extra-service.d/frontend.conf.template diff --git a/birdhouse/deprecated-components/frontend/config/proxy/docker-compose-extra.yml b/birdhouse/deprecated-components/frontend/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..bd40798d1 --- /dev/null +++ b/birdhouse/deprecated-components/frontend/config/proxy/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/frontend/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/frontend:ro diff --git a/birdhouse/config/frontend/default.env b/birdhouse/deprecated-components/frontend/default.env similarity index 100% rename from birdhouse/config/frontend/default.env rename to birdhouse/deprecated-components/frontend/default.env diff --git a/birdhouse/config/frontend/docker-compose-extra.yml b/birdhouse/deprecated-components/frontend/docker-compose-extra.yml similarity index 84% rename from birdhouse/config/frontend/docker-compose-extra.yml rename to birdhouse/deprecated-components/frontend/docker-compose-extra.yml index 7d419539f..b987e342e 100644 --- a/birdhouse/config/frontend/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/frontend/docker-compose-extra.yml @@ -14,6 +14,6 @@ services: ports: - "3000:3000" env_file: - - ./config/frontend/frontend.env + - ./deprecated-components/frontend/frontend.env restart: always logging: *default-logging diff --git a/birdhouse/config/frontend/frontend.env.template b/birdhouse/deprecated-components/frontend/frontend.env.template similarity index 100% rename from birdhouse/config/frontend/frontend.env.template rename to birdhouse/deprecated-components/frontend/frontend.env.template diff --git a/birdhouse/config/malleefowl/.gitignore b/birdhouse/deprecated-components/malleefowl/.gitignore similarity index 100% rename from birdhouse/config/malleefowl/.gitignore rename to birdhouse/deprecated-components/malleefowl/.gitignore diff --git a/birdhouse/config/malleefowl/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/deprecated-components/malleefowl/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/malleefowl/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/deprecated-components/malleefowl/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/deprecated-components/malleefowl/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..dfdbb10fe --- /dev/null +++ b/birdhouse/deprecated-components/malleefowl/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/malleefowl/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/malleefowl_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/malleefowl/config/data-volume/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/config/data-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/malleefowl/config/data-volume/docker-compose-extra.yml rename to birdhouse/deprecated-components/malleefowl/config/data-volume/docker-compose-extra.yml diff --git a/birdhouse/deprecated-components/malleefowl/config/magpie/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..87f2fc433 --- /dev/null +++ b/birdhouse/deprecated-components/malleefowl/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + magpie: + volumes: + - ./deprecated-components/malleefowl/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/malleefowl-providers.cfg:ro diff --git a/birdhouse/config/malleefowl/config/magpie/providers.cfg.template b/birdhouse/deprecated-components/malleefowl/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/malleefowl/config/magpie/providers.cfg.template rename to birdhouse/deprecated-components/malleefowl/config/magpie/providers.cfg.template diff --git a/birdhouse/config/malleefowl/config/wps_outputs-volume/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/config/wps_outputs-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/malleefowl/config/wps_outputs-volume/docker-compose-extra.yml rename to birdhouse/deprecated-components/malleefowl/config/wps_outputs-volume/docker-compose-extra.yml diff --git a/birdhouse/config/malleefowl/custom.cfg.template b/birdhouse/deprecated-components/malleefowl/custom.cfg.template similarity index 100% rename from birdhouse/config/malleefowl/custom.cfg.template rename to birdhouse/deprecated-components/malleefowl/custom.cfg.template diff --git a/birdhouse/config/malleefowl/default.env b/birdhouse/deprecated-components/malleefowl/default.env similarity index 100% rename from birdhouse/config/malleefowl/default.env rename to birdhouse/deprecated-components/malleefowl/default.env diff --git a/birdhouse/config/malleefowl/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/docker-compose-extra.yml similarity index 86% rename from birdhouse/config/malleefowl/docker-compose-extra.yml rename to birdhouse/deprecated-components/malleefowl/docker-compose-extra.yml index b06114350..8babd5f43 100644 --- a/birdhouse/config/malleefowl/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/malleefowl/docker-compose-extra.yml @@ -24,7 +24,7 @@ services: - "48091:9001" volumes: - ${DATA_PERSIST_ROOT}/datasets:/pavics-data - - ./config/malleefowl/custom.cfg:/opt/birdhouse/src/malleefowl/custom.cfg + - ./deprecated-components/malleefowl/custom.cfg:/opt/birdhouse/src/malleefowl/custom.cfg depends_on: - postgres restart: always diff --git a/birdhouse/config/ncops/.gitignore b/birdhouse/deprecated-components/ncops/.gitignore similarity index 100% rename from birdhouse/config/ncops/.gitignore rename to birdhouse/deprecated-components/ncops/.gitignore diff --git a/birdhouse/config/ncops/default.env b/birdhouse/deprecated-components/ncops/default.env similarity index 100% rename from birdhouse/config/ncops/default.env rename to birdhouse/deprecated-components/ncops/default.env diff --git a/birdhouse/config/ncops/ncops.cfg.template b/birdhouse/deprecated-components/ncops/ncops.cfg.template similarity index 100% rename from birdhouse/config/ncops/ncops.cfg.template rename to birdhouse/deprecated-components/ncops/ncops.cfg.template diff --git a/birdhouse/config/ncwms2/.gitignore b/birdhouse/deprecated-components/ncwms2/.gitignore similarity index 100% rename from birdhouse/config/ncwms2/.gitignore rename to birdhouse/deprecated-components/ncwms2/.gitignore diff --git a/birdhouse/deprecated-components/ncwms2/config/magpie/docker-compose-extra.yml b/birdhouse/deprecated-components/ncwms2/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..7d26bc5fc --- /dev/null +++ b/birdhouse/deprecated-components/ncwms2/config/magpie/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + magpie: + volumes: + - ./deprecated-components/ncwms2/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/ncwms2-providers.cfg:ro diff --git a/birdhouse/config/ncwms2/config/magpie/providers.cfg.template b/birdhouse/deprecated-components/ncwms2/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/ncwms2/config/magpie/providers.cfg.template rename to birdhouse/deprecated-components/ncwms2/config/magpie/providers.cfg.template diff --git a/birdhouse/config/ncwms2/config/proxy/conf.extra-service.d/ncwms2.conf.template b/birdhouse/deprecated-components/ncwms2/config/proxy/conf.extra-service.d/ncwms2.conf.template similarity index 100% rename from birdhouse/config/ncwms2/config/proxy/conf.extra-service.d/ncwms2.conf.template rename to birdhouse/deprecated-components/ncwms2/config/proxy/conf.extra-service.d/ncwms2.conf.template diff --git a/birdhouse/deprecated-components/ncwms2/config/proxy/docker-compose-extra.yml b/birdhouse/deprecated-components/ncwms2/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..ff00e6799 --- /dev/null +++ b/birdhouse/deprecated-components/ncwms2/config/proxy/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/ncwms2/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/ncwms2:ro diff --git a/birdhouse/config/ncwms2/config/wps_outputs-volume/docker-compose-extra.yml b/birdhouse/deprecated-components/ncwms2/config/wps_outputs-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/ncwms2/config/wps_outputs-volume/docker-compose-extra.yml rename to birdhouse/deprecated-components/ncwms2/config/wps_outputs-volume/docker-compose-extra.yml diff --git a/birdhouse/config/ncwms2/custom.cfg.template b/birdhouse/deprecated-components/ncwms2/custom.cfg.template similarity index 100% rename from birdhouse/config/ncwms2/custom.cfg.template rename to birdhouse/deprecated-components/ncwms2/custom.cfg.template diff --git a/birdhouse/config/ncwms2/default.env b/birdhouse/deprecated-components/ncwms2/default.env similarity index 100% rename from birdhouse/config/ncwms2/default.env rename to birdhouse/deprecated-components/ncwms2/default.env diff --git a/birdhouse/config/ncwms2/docker-compose-extra.yml b/birdhouse/deprecated-components/ncwms2/docker-compose-extra.yml similarity index 60% rename from birdhouse/config/ncwms2/docker-compose-extra.yml rename to birdhouse/deprecated-components/ncwms2/docker-compose-extra.yml index d6840e8ae..d725adfc5 100644 --- a/birdhouse/config/ncwms2/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/ncwms2/docker-compose-extra.yml @@ -16,7 +16,7 @@ services: - "48080:9001" volumes: - ${DATA_PERSIST_ROOT}/datasets:/pavics-data - - ./config/ncwms2/custom.cfg:/opt/birdhouse/custom.cfg - - ./config/ncwms2/server.xml:/opt/birdhouse/eggs/birdhousebuilder.recipe.tomcat-0.2.9-py2.7.egg/birdhousebuilder/recipe/tomcat/server.xml + - ./deprecated-components/ncwms2/custom.cfg:/opt/birdhouse/custom.cfg + - ./deprecated-components/ncwms2/server.xml:/opt/birdhouse/eggs/birdhousebuilder.recipe.tomcat-0.2.9-py2.7.egg/birdhousebuilder/recipe/tomcat/server.xml restart: always logging: *default-logging diff --git a/birdhouse/config/ncwms2/server.xml b/birdhouse/deprecated-components/ncwms2/server.xml similarity index 100% rename from birdhouse/config/ncwms2/server.xml rename to birdhouse/deprecated-components/ncwms2/server.xml diff --git a/birdhouse/config/phoenix/.gitignore b/birdhouse/deprecated-components/phoenix/.gitignore similarity index 100% rename from birdhouse/config/phoenix/.gitignore rename to birdhouse/deprecated-components/phoenix/.gitignore diff --git a/birdhouse/config/phoenix/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/deprecated-components/phoenix/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/phoenix/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/deprecated-components/phoenix/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/deprecated-components/phoenix/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/phoenix/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..dd3413d37 --- /dev/null +++ b/birdhouse/deprecated-components/phoenix/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/phoenix/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/phoenix_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/phoenix/custom.cfg.template b/birdhouse/deprecated-components/phoenix/custom.cfg.template similarity index 100% rename from birdhouse/config/phoenix/custom.cfg.template rename to birdhouse/deprecated-components/phoenix/custom.cfg.template diff --git a/birdhouse/config/phoenix/default.env b/birdhouse/deprecated-components/phoenix/default.env similarity index 100% rename from birdhouse/config/phoenix/default.env rename to birdhouse/deprecated-components/phoenix/default.env diff --git a/birdhouse/config/phoenix/docker-compose-extra.yml b/birdhouse/deprecated-components/phoenix/docker-compose-extra.yml similarity index 88% rename from birdhouse/config/phoenix/docker-compose-extra.yml rename to birdhouse/deprecated-components/phoenix/docker-compose-extra.yml index 21304f16e..2205263ec 100644 --- a/birdhouse/config/phoenix/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/phoenix/docker-compose-extra.yml @@ -22,7 +22,7 @@ services: - "38443:38443" - "9001:9001" volumes: - - ./config/phoenix/custom.cfg:/opt/birdhouse/src/phoenix/custom.cfg + - ./deprecated-components/phoenix/custom.cfg:/opt/birdhouse/src/phoenix/custom.cfg - ${SSL_CERTIFICATE}:/opt/birdhouse/etc/nginx/cert.pem links: - mongodb diff --git a/birdhouse/config/project-api/.gitignore b/birdhouse/deprecated-components/project-api/.gitignore similarity index 100% rename from birdhouse/config/project-api/.gitignore rename to birdhouse/deprecated-components/project-api/.gitignore diff --git a/birdhouse/config/project-api/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/deprecated-components/project-api/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/project-api/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/deprecated-components/project-api/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/deprecated-components/project-api/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/project-api/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..264d0b840 --- /dev/null +++ b/birdhouse/deprecated-components/project-api/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/project-api/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/project-api_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/project-api/config/proxy/conf.extra-service.d/project-api.conf.template b/birdhouse/deprecated-components/project-api/config/proxy/conf.extra-service.d/project-api.conf.template similarity index 100% rename from birdhouse/config/project-api/config/proxy/conf.extra-service.d/project-api.conf.template rename to birdhouse/deprecated-components/project-api/config/proxy/conf.extra-service.d/project-api.conf.template diff --git a/birdhouse/deprecated-components/project-api/config/proxy/docker-compose-extra.yml b/birdhouse/deprecated-components/project-api/config/proxy/docker-compose-extra.yml new file mode 100644 index 000000000..295012598 --- /dev/null +++ b/birdhouse/deprecated-components/project-api/config/proxy/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/project-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/project-api:ro diff --git a/birdhouse/config/project-api/default.env b/birdhouse/deprecated-components/project-api/default.env similarity index 100% rename from birdhouse/config/project-api/default.env rename to birdhouse/deprecated-components/project-api/default.env diff --git a/birdhouse/config/project-api/docker-compose-extra.yml b/birdhouse/deprecated-components/project-api/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/project-api/docker-compose-extra.yml rename to birdhouse/deprecated-components/project-api/docker-compose-extra.yml diff --git a/birdhouse/config/solr/.gitignore b/birdhouse/deprecated-components/solr/.gitignore similarity index 100% rename from birdhouse/config/solr/.gitignore rename to birdhouse/deprecated-components/solr/.gitignore diff --git a/birdhouse/config/solr/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/deprecated-components/solr/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/solr/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/deprecated-components/solr/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/deprecated-components/solr/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/solr/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..13d31a9b9 --- /dev/null +++ b/birdhouse/deprecated-components/solr/config/canarie-api/docker-compose-extra.yml @@ -0,0 +1,5 @@ +version: "3.4" +services: + proxy: + volumes: + - ./deprecated-components/solr/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/solr_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/solr/default.env b/birdhouse/deprecated-components/solr/default.env similarity index 100% rename from birdhouse/config/solr/default.env rename to birdhouse/deprecated-components/solr/default.env diff --git a/birdhouse/config/solr/docker-compose-extra.yml b/birdhouse/deprecated-components/solr/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/solr/docker-compose-extra.yml rename to birdhouse/deprecated-components/solr/docker-compose-extra.yml diff --git a/birdhouse/env.local.example b/birdhouse/env.local.example index 964e3e3ca..87e1a53c3 100644 --- a/birdhouse/env.local.example +++ b/birdhouse/env.local.example @@ -18,15 +18,9 @@ export MAGPIE_ADMIN_USERNAME=admin # For initial bootstrap only, change in the Magpie Web UI after initial boostrap. export MAGPIE_ADMIN_PASSWORD=qwertyqwerty! export TWITCHER_PROTECTED_PATH=/twitcher/ows/proxy -export PHOENIX_PASSWORD=phoenix_pass -export PHOENIX_PASSWORD_HASH=sha256:123456789012:1234567890123456789012345678901234567890123456789012345678901234 -export TOMCAT_NCWMS_PASSWORD=ncwmspass export SUPPORT_EMAIL=helpdesk@example.com export CMIP5_THREDDS_ROOT=birdhouse/CMIP5/CCCMA export JUPYTERHUB_ADMIN_USERS="{'admin'}" # python set syntax -export CATALOG_USERNAME=admin-catalog -export CATALOG_PASSWORD=qwerty -export CATALOG_THREDDS_SERVICE=thredds export POSTGRES_PAVICS_USERNAME=postgres-pavics export POSTGRES_PAVICS_PASSWORD=postgres-qwerty export POSTGRES_MAGPIE_USERNAME=postgres-magpie @@ -486,3 +480,13 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass # Emu WPS service image if that testing component is enabled #export EMU_IMAGE="tlvu/emu:watchdog" + +############################################################################# +# Deprecated vars (for components in the ./deprecated-components directory) +############################################################################# +export TOMCAT_NCWMS_PASSWORD=ncwmspass +export CATALOG_USERNAME=admin-catalog +export CATALOG_PASSWORD=qwerty +export CATALOG_THREDDS_SERVICE=thredds +export PHOENIX_PASSWORD=phoenix_pass +export PHOENIX_PASSWORD_HASH=sha256:123456789012:1234567890123456789012345678901234567890123456789012345678901234 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/.gitignore index a27b5cd21..c8e7680db 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/.gitignore +++ b/birdhouse/optional-components/canarie-api-full-monitoring/.gitignore @@ -1,5 +1,4 @@ -config/canarie-api/canarie_api_full_monitoring.py - # Old paths. Keep these so that old config files remain uncommittable after updates. canarie_api_full_monitoring.py config/proxy/canarie_api_full_monitoring.py +config/canarie-api/canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/.gitignore new file mode 100644 index 000000000..4a4930385 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/.gitignore @@ -0,0 +1,2 @@ +# Old paths. Keep these so that old config files remain uncommittable after updates. +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/canarie_api_full_monitoring.py.template deleted file mode 100644 index 62df02d75..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/canarie_api_full_monitoring.py.template +++ /dev/null @@ -1,64 +0,0 @@ -import copy - -_BIRDS = { - 'Thredds-public': { - 'request': { - 'url': 'https://${PAVICS_FQDN_PUBLIC}/thredds/catalog.html', - }, - }, - # Flyingpigeon is used for Twitcher monitoring already - 'Catalog-public': { - 'request': { - 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/catalog?service=WPS&version=1.0.0&request=GetCapabilities' - }, - }, - 'Malleefowl-public': { - 'request': { - 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/malleefowl?service=WPS&version=1.0.0&request=GetCapabilities' - } - }, - 'Finch-public': { - 'request': { - 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/finch?service=WPS&version=1.0.0&request=GetCapabilities' - } - }, - 'Raven-public': { - 'request': { - 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/raven?service=WPS&version=1.0.0&request=GetCapabilities' - } - }, - 'Hummingbird-public': { - 'request': { - 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/hummingbird?service=WPS&version=1.0.0&request=GetCapabilities' - } - }, - # FIXME: remove (https://github.com/bird-house/birdhouse-deploy/issues/214) - 'ncWMS2-public': { - 'request': { - 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/ncWMS2/wms?SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0' - } - }, -} -for bird_public, bird_public_cfg in _BIRDS.items(): - bird_private = bird_public.split("-public")[0] - if bird_private in SERVICES: - SERVICES[bird_private]["monitoring"][bird_public] = bird_public_cfg - elif "node" in SERVICES: - SERVICES["node"]["monitoring"][bird_public] = bird_public_cfg - - -# See notes in 'components/weaver/docker-compose-extra.yml' -# about the conditional loading of this config in 'proxy' service. -if "Weaver" in SERVICES: - weaver_cfg = copy.deepcopy(SERVICES["Weaver"]["monitoring"]["Weaver"]) - weaver_cfg["request"]["url"] = "https://${PAVICS_FQDN_PUBLIC}/weaver/" - SERVICES["Weaver"]["monitoring"]["Weaver-public"] = weaver_cfg - -# See notes in 'components/cowbird/docker-compose-extra.yml' -# about the conditional loading of this config in 'proxy' service. -if "Cowbird" in SERVICES: - cowbird_cfg = copy.deepcopy(SERVICES["Cowbird"]["monitoring"]["Cowbird"]) - cowbird_cfg["request"]["url"] = "https://${PAVICS_FQDN_PUBLIC}/cowbird/" - SERVICES["Cowbird"]["monitoring"]["Cowbird-public"] = cowbird_cfg - -# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/docker-compose-extra.yml index 0fb5908d1..b41e0108a 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/docker-compose-extra.yml @@ -2,7 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/canarie-api/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/canarie_api_full_monitoring.py:ro - ./optional-components/canarie-api-full-monitoring/config/canarie-api/a_demo_override_precedence.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/a_demo_override_precedence.py:ro - ./optional-components/canarie-api-full-monitoring/config/canarie-api/z_demo_only_py_file_are_loaded.wrongsuffix:${CANARIE_MONITORING_EXTRA_CONF_DIR}/z_demo_only_py_file_are_loaded.wrongsuffix:ro diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..41bb48c6d --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/canarie_api_full_monitoring.py.template @@ -0,0 +1,16 @@ +import copy + +service_public = "Catalog-public" +service_public_cfg = { + 'request': { + 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/catalog?service=WPS&version=1.0.0&request=GetCapabilities' + }, +} + +service_private = service_public.split("-public")[0] +if service_private in SERVICES: + SERVICES[service_private]["monitoring"][service_public] = service_public_cfg +elif "node" in SERVICES: + SERVICES["node"]["monitoring"][service_public] = service_public_cfg + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/docker-compose-extra.yml new file mode 100644 index 000000000..efd03784c --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/catalog/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/catalog_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..fd4972b79 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/canarie_api_full_monitoring.py.template @@ -0,0 +1,10 @@ +import copy + +if "Cowbird" in SERVICES: + # See notes in 'components/cowbird/docker-compose-extra.yml' + # about the conditional loading of this config in 'proxy' service. + cowbird_cfg = copy.deepcopy(SERVICES["Cowbird"]["monitoring"]["Cowbird"]) + cowbird_cfg["request"]["url"] = "https://${PAVICS_FQDN_PUBLIC}/cowbird/" + SERVICES["Cowbird"]["monitoring"]["Cowbird-public"] = cowbird_cfg + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/docker-compose-extra.yml new file mode 100644 index 000000000..35dca0a1d --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/cowbird/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/cowbird_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..b30f52ed5 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/canarie_api_full_monitoring.py.template @@ -0,0 +1,16 @@ +import copy + +service_public = "Finch-public" +service_public_cfg = { + 'request': { + 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/finch?service=WPS&version=1.0.0&request=GetCapabilities' + } +} + +service_private = service_public.split("-public")[0] +if service_private in SERVICES: + SERVICES[service_private]["monitoring"][service_public] = service_public_cfg +elif "node" in SERVICES: + SERVICES["node"]["monitoring"][service_public] = service_public_cfg + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/docker-compose-extra.yml new file mode 100644 index 000000000..911a52f47 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/finch/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..dd7f0780a --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/canarie_api_full_monitoring.py.template @@ -0,0 +1,17 @@ +import copy + +service_public = "Hummingbird-public" +service_public_cfg = { + 'request': { + 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/hummingbird?service=WPS&version=1.0.0&request=GetCapabilities' + } +} + +service_private = service_public.split("-public")[0] +if service_private in SERVICES: + SERVICES[service_private]["monitoring"][service_public] = service_public_cfg +elif "node" in SERVICES: + SERVICES["node"]["monitoring"][service_public] = service_public_cfg + + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/docker-compose-extra.yml new file mode 100644 index 000000000..fd77c0c34 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/hummingbird/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..ffcd08bc4 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/canarie_api_full_monitoring.py.template @@ -0,0 +1,16 @@ +import copy + +service_public = "Malleefowl-public" +service_public_cfg = { + 'request': { + 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/malleefowl?service=WPS&version=1.0.0&request=GetCapabilities' + } +} + +service_private = service_public.split("-public")[0] +if service_private in SERVICES: + SERVICES[service_private]["monitoring"][service_public] = service_public_cfg +elif "node" in SERVICES: + SERVICES["node"]["monitoring"][service_public] = service_public_cfg + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/docker-compose-extra.yml new file mode 100644 index 000000000..2406bff9d --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/malleefowl/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/malleefowl_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..6d926c929 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/canarie_api_full_monitoring.py.template @@ -0,0 +1,16 @@ +import copy + +service_public = "ncWMS2-public" +service_public_cfg = { + 'request': { + 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/ncWMS2/wms?SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0' + } +} + +service_private = service_public.split("-public")[0] +if service_private in SERVICES: + SERVICES[service_private]["monitoring"][service_public] = service_public_cfg +elif "node" in SERVICES: + SERVICES["node"]["monitoring"][service_public] = service_public_cfg + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/docker-compose-extra.yml new file mode 100644 index 000000000..80999e95c --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/ncwms2/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/ncwms2_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..2d3df52f1 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/canarie_api_full_monitoring.py.template @@ -0,0 +1,16 @@ +import copy + +service_public = "Raven-public" +service_public_cfg = { + 'request': { + 'url': 'https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/raven?service=WPS&version=1.0.0&request=GetCapabilities' + } +} + +service_private = service_public.split("-public")[0] +if service_private in SERVICES: + SERVICES[service_private]["monitoring"][service_public] = service_public_cfg +elif "node" in SERVICES: + SERVICES["node"]["monitoring"][service_public] = service_public_cfg + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/docker-compose-extra.yml new file mode 100644 index 000000000..1062b6cd7 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/raven/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..43b82437d --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/canarie_api_full_monitoring.py.template @@ -0,0 +1,16 @@ +import copy + +service_public = "Thredds-public" +service_public_cfg = { + 'request': { + 'url': 'https://${PAVICS_FQDN_PUBLIC}/thredds/catalog.html', + }, +} + +service_private = service_public.split("-public")[0] +if service_private in SERVICES: + SERVICES[service_private]["monitoring"][service_public] = service_public_cfg +elif "node" in SERVICES: + SERVICES["node"]["monitoring"][service_public] = service_public_cfg + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/docker-compose-extra.yml new file mode 100644 index 000000000..611e41f0c --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/thredds/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/.gitignore new file mode 100644 index 000000000..de66237e8 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/.gitignore @@ -0,0 +1 @@ +canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/canarie_api_full_monitoring.py.template b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/canarie_api_full_monitoring.py.template new file mode 100644 index 000000000..16f0ee8f4 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/canarie_api_full_monitoring.py.template @@ -0,0 +1,10 @@ +import copy + +if "Weaver" in SERVICES: + # See notes in 'components/weaver/docker-compose-extra.yml' + # about the conditional loading of this config in 'proxy' service. + weaver_cfg = copy.deepcopy(SERVICES["Weaver"]["monitoring"]["Weaver"]) + weaver_cfg["request"]["url"] = "https://${PAVICS_FQDN_PUBLIC}/weaver/" + SERVICES["Weaver"]["monitoring"]["Weaver-public"] = weaver_cfg + +# vi: tabstop=8 expandtab shiftwidth=4 softtabstop=4 syntax=python diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/docker-compose-extra.yml new file mode 100644 index 000000000..1e8ff5f33 --- /dev/null +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/docker-compose-extra.yml @@ -0,0 +1,7 @@ +version: "3.4" +services: + proxy: + volumes: + - ./optional-components/canarie-api-full-monitoring/config/weaver/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/weaver_canarie_api_full_monitoring.py:ro + +# vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/scripts/bootstrap-instance-for-testsuite b/birdhouse/scripts/bootstrap-instance-for-testsuite index 82fef558c..dac2acdbb 100755 --- a/birdhouse/scripts/bootstrap-instance-for-testsuite +++ b/birdhouse/scripts/bootstrap-instance-for-testsuite @@ -18,15 +18,17 @@ set -x # Need write-access to DATASET_ROOT (/data/datasets/). $THIS_DIR/bootstrap-testdata -# Index Thredds catalog. -# Need to open temporary Thredds "testdata/secure/" on local PAVICS host to anonymous group. -# Only crawl the subset enough to pass canarie-api monitoring -# see config/canarie-api/docker_configuration.py.template -$THIS_DIR/trigger-pavicscrawler target_files=birdhouse/testdata/flyingpigeon/cmip5 +if [ -n "$(docker ps --filter name=solr)" ]; then + # Index Thredds catalog. + # Need to open temporary Thredds "testdata/secure/" on local PAVICS host to anonymous group. + # Only crawl the subset enough to pass canarie-api monitoring + # see config/canarie-api/docker_configuration.py.template + $THIS_DIR/trigger-pavicscrawler target_files=birdhouse/testdata/flyingpigeon/cmip5 -# For crawler to complete, assuming minimal dataset from bootstrap-testdata so -# should be super fast to finish crawling. -sleep 5 + # For crawler to complete, assuming minimal dataset from bootstrap-testdata so + # should be super fast to finish crawling. + sleep 5 +fi # Create test user. # Need "optional-components/secure-thredds" activated to pre-create group thredds-secure-authtest-group. diff --git a/birdhouse/scripts/deprecated/README.rst b/birdhouse/scripts/deprecated/README.rst new file mode 100644 index 000000000..66d22f1b9 --- /dev/null +++ b/birdhouse/scripts/deprecated/README.rst @@ -0,0 +1,11 @@ +Deprecated Scripts +################## + +.. contents:: + +All scripts in this directory are not actively maintained. + +If you wish to run these scripts against the deployed stack, additional work +may be required to make them compatible with the current stack. + +Scripts in this directory may be removed from this repository at any time. diff --git a/birdhouse/scripts/backup-restore-solr-index b/birdhouse/scripts/deprecated/backup-restore-solr-index similarity index 100% rename from birdhouse/scripts/backup-restore-solr-index rename to birdhouse/scripts/deprecated/backup-restore-solr-index diff --git a/birdhouse/scripts/trigger-pavicscrawler b/birdhouse/scripts/deprecated/trigger-pavicscrawler similarity index 100% rename from birdhouse/scripts/trigger-pavicscrawler rename to birdhouse/scripts/deprecated/trigger-pavicscrawler diff --git a/docs/source/conf.py b/docs/source/conf.py index fc0236f0b..de7abc286 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.26.11' +version = '1.27.0' # The full version, including alpha/beta/rc tags. -release = '1.26.11' +release = '1.27.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/data_catalog.rst b/docs/source/data_catalog.rst index efc173e1c..c92c065d9 100644 --- a/docs/source/data_catalog.rst +++ b/docs/source/data_catalog.rst @@ -6,6 +6,12 @@ for data and add data to the catalog. PAVICS Catalogue Search ----------------------- ++--------------+---------------------------------------------------------------------+ +| |deprecated| | this is no longer maintained and may be removed in a future version | ++--------------+---------------------------------------------------------------------+ + +.. |deprecated| image:: https://img.shields.io/badge/status-deprecated-orange + The ``pavicssearch`` service closely mimics the API for the Earth System Grid Federation (ESGF) search. The search fields (or *facets*) include author, category, cf_standard_name, experiment, frequency, diff --git a/tests/test_read_configs_include.py b/tests/test_read_configs_include.py index e849d1ead..9d96090c7 100644 --- a/tests/test_read_configs_include.py +++ b/tests/test_read_configs_include.py @@ -54,27 +54,19 @@ class TestReadConfigs: default_all_conf_order: list[str] = [ "./config/proxy", "./config/canarie-api", + "./config/geoserver", "./config/postgres", "./config/wps_outputs-volume", - "./config/data-volume", - "./config/malleefowl", "./config/flyingpigeon", - "./config/catalog", - "./config/mongodb", - "./config/phoenix", - "./config/geoserver", "./config/finch", "./config/raven", + "./config/data-volume", "./config/hummingbird", "./config/thredds", "./config/portainer", "./config/magpie", "./config/twitcher", - "./config/jupyterhub", - "./config/ncwms2", - "./config/frontend", - "./config/project-api", - "./config/solr", + "./config/jupyterhub" ] def run_func( @@ -182,32 +174,23 @@ class TestCreateComposeConfList: "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/postgres/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/data-volume/docker-compose-extra.yml", - "./config/malleefowl/docker-compose-extra.yml", - "./config/malleefowl/config/canarie-api/docker-compose-extra.yml", - "./config/malleefowl/config/data-volume/docker-compose-extra.yml", - "./config/malleefowl/config/wps_outputs-volume/docker-compose-extra.yml", "./config/flyingpigeon/docker-compose-extra.yml", "./config/flyingpigeon/config/canarie-api/docker-compose-extra.yml", "./config/flyingpigeon/config/wps_outputs-volume/docker-compose-extra.yml", - "./config/catalog/docker-compose-extra.yml", - "./config/catalog/config/canarie-api/docker-compose-extra.yml", - "./config/mongodb/docker-compose-extra.yml", - "./config/phoenix/docker-compose-extra.yml", - "./config/phoenix/config/canarie-api/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/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", @@ -218,13 +201,12 @@ class TestCreateComposeConfList: "./config/portainer/docker-compose-extra.yml", "./config/portainer/config/proxy/docker-compose-extra.yml", "./config/magpie/docker-compose-extra.yml", - "./config/malleefowl/config/magpie/docker-compose-extra.yml", - "./config/flyingpigeon/config/magpie/docker-compose-extra.yml", - "./config/catalog/config/magpie/docker-compose-extra.yml", "./config/geoserver/config/magpie/docker-compose-extra.yml", + "./config/flyingpigeon/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", @@ -234,18 +216,6 @@ class TestCreateComposeConfList: "./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", - "./config/ncwms2/docker-compose-extra.yml", - "./config/ncwms2/config/magpie/docker-compose-extra.yml", - "./config/ncwms2/config/proxy/docker-compose-extra.yml", - "./config/ncwms2/config/wps_outputs-volume/docker-compose-extra.yml", - "./config/frontend/docker-compose-extra.yml", - "./config/frontend/config/canarie-api/docker-compose-extra.yml", - "./config/frontend/config/proxy/docker-compose-extra.yml", - "./config/project-api/docker-compose-extra.yml", - "./config/project-api/config/canarie-api/docker-compose-extra.yml", - "./config/project-api/config/proxy/docker-compose-extra.yml", - "./config/solr/docker-compose-extra.yml", - "./config/solr/config/canarie-api/docker-compose-extra.yml", ] def run_func(self, include_file: str, local_env: dict, command_suffix: str = "") -> subprocess.CompletedProcess: