diff --git a/birdhouse/components/cowbird/config/cowbird/config.yml.template b/birdhouse/components/cowbird/config/cowbird/config.yml.template index da56039d0..fefbf6ecb 100644 --- a/birdhouse/components/cowbird/config/cowbird/config.yml.template +++ b/birdhouse/components/cowbird/config/cowbird/config.yml.template @@ -19,10 +19,6 @@ handlers: workspace_dir: ${WORKSPACE_DIR} admin_user: ${GEOSERVER_ADMIN_USER} admin_password: ${GEOSERVER_ADMIN_PASSWORD} - Catalog: - active: true - url: https://${PAVICS_FQDN_PUBLIC}/twitcher/ows/proxy/catalog - workspace_dir: ${WORKSPACE_DIR} Thredds: active: true Nginx: diff --git a/birdhouse/components/weaver/config/magpie/config.yml.template b/birdhouse/components/weaver/config/magpie/config.yml.template index 6298aca70..17ce899b8 100644 --- a/birdhouse/components/weaver/config/magpie/config.yml.template +++ b/birdhouse/components/weaver/config/magpie/config.yml.template @@ -119,12 +119,6 @@ permissions: # Provider processes listing # (each provider in './components/weaver/config/weaver/wps_processes.yml.template') - # catalog - - service: ${WEAVER_MANAGER_NAME} - resource: /providers/catalog - permission: read - group: anonymous - action: create # finch - service: ${WEAVER_MANAGER_NAME} resource: /providers/finch diff --git a/birdhouse/components/weaver/default.env b/birdhouse/components/weaver/default.env index e7ae4e39c..a90d8cf11 100644 --- a/birdhouse/components/weaver/default.env +++ b/birdhouse/components/weaver/default.env @@ -85,7 +85,6 @@ export WEAVER_WORKER_LOG_LEVEL=INFO # registration of WPS providers offerred by this instance export WEAVER_WPS_PROVIDERS=" - catalog finch flyingpigeon hummingbird diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index 38cd195cc..acf8aaf98 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/config/canarie-api/docker_configuration.py.template @@ -62,11 +62,6 @@ SERVICES = { 'url': 'https://${PAVICS_FQDN_PUBLIC}/geoserver/web/' } }, - 'Catalog': { - 'request': { - 'url': 'http://${PAVICS_FQDN}:8086/pywps?service=WPS&version=1.0.0&request=GetCapabilities' - } - }, 'Malleefowl': { 'request': { 'url': 'http://${PAVICS_FQDN}:8091/wps?service=WPS&version=1.0.0&request=GetCapabilities' @@ -82,14 +77,6 @@ SERVICES = { 'url': 'http://${PAVICS_FQDN}:8096/wps?service=WPS&version=1.0.0&request=GetCapabilities' } }, - 'Solr': { - 'request': { - 'url': 'http://${PAVICS_FQDN}:8983/solr/birdhouse/select?q=CMIP5&fq=model:MPI-ESM-MR&fq=experiment:rcp45&fq=variable:tasmax&fq=institute:MPI-M&fq=frequency:mon&wt=json' - }, - 'response': { - 'text': '.*catalog_url\":\".+/testdata/flyingpigeon/cmip5.*/catalog.xml.*' - } - }, 'Thredds': { 'request': { 'url': 'http://${PAVICS_FQDN}:8083${TWITCHER_PROTECTED_PATH}/thredds/catalog.html' diff --git a/birdhouse/config/catalog/.gitignore b/birdhouse/config/catalog/.gitignore deleted file mode 100644 index e72ae864d..000000000 --- a/birdhouse/config/catalog/.gitignore +++ /dev/null @@ -1 +0,0 @@ -catalog.cfg diff --git a/birdhouse/config/catalog/catalog.cfg.template b/birdhouse/config/catalog/catalog.cfg.template deleted file mode 100644 index 770a8f555..000000000 --- a/birdhouse/config/catalog/catalog.cfg.template +++ /dev/null @@ -1,34 +0,0 @@ -[catalog] -solr_host=http://${PAVICS_FQDN}:8983/solr/birdhouse/ - -# Multiple thredds hosts can be given, comma separated -# note: this URL is also used as prefix when comparing authorizations from magpie -thredds_host=https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/thredds - -# Multiple esgf nodes can be given, comma separated -esgf_nodes=https://esgf-node.llnl.gov/esg-search - -# Provide a magpie host to filter results based on access permissions. -# Must also provide credentials with read access so that the crawler can parse the thredds host(s) -# Leave as a comment for a public catalog. -magpie_host=https://${PAVICS_FQDN_PUBLIC}/magpie -magpie_user=${CATALOG_USERNAME} -magpie_pw=${CATALOG_PASSWORD} -# SSL verification (true or false) -verify=true -# Comma separated list of magpie service name for the thredds hosts listed above -thredds_host_magpie_svc_name=${CATALOG_THREDDS_SERVICE} - -# WMS service url with replaced by each instance of the thredds_host, -# without the port number and replaced by the base url in thredds. -# Leave as comment to use the default WMS service -wms_alternate_server=https://${PAVICS_FQDN_PUBLIC}${TWITCHER_PROTECTED_PATH}/ncWMS2/wms?SERVICE=WMS&REQUEST=GetCapabilities&VERSION=1.3.0&DATASET=outputs/ - -[pywps] -outputurl=https://${PAVICS_FQDN_PUBLIC}/wpsoutputs/catalog -parallelprocesses=30 - -[logging] -#level=DEBUG -#file=/tmp/wps.log -database=postgresql://${POSTGRES_PAVICS_USERNAME}:${POSTGRES_PAVICS_PASSWORD}@postgres/catalog diff --git a/birdhouse/config/frontend/frontend.env.template b/birdhouse/config/frontend/frontend.env.template index 46570df97..74634ed65 100644 --- a/birdhouse/config/frontend/frontend.env.template +++ b/birdhouse/config/frontend/frontend.env.template @@ -4,5 +4,4 @@ PAVICS_FRONTEND_PROTO=https BIRDHOUSE_HOST=${PAVICS_FQDN} NODE_TLS_REJECT_UNAUTHORIZED=0 NCWMS_HOST=https://${PAVICS_FQDN}${TWITCHER_PROTECTED_PATH}/ncWMS2/wms -CATALOG_HOST=https://${PAVICS_FQDN}${TWITCHER_PROTECTED_PATH}/catalog/pywps MALLEEFOWL_HOST=https://${PAVICS_FQDN}${TWITCHER_PROTECTED_PATH}/malleefowl/wps diff --git a/birdhouse/config/magpie/providers.cfg.template b/birdhouse/config/magpie/providers.cfg.template index 9d5d49c54..5f5d0dccf 100644 --- a/birdhouse/config/magpie/providers.cfg.template +++ b/birdhouse/config/magpie/providers.cfg.template @@ -1,11 +1,4 @@ providers: - catalog: - url: http://${PAVICS_FQDN}:8086/pywps - title: Catalog - public: true - c4i: false - type: wps - sync_type: wps malleefowl: url: http://${PAVICS_FQDN}:8091/wps diff --git a/birdhouse/config/postgres/docker-entrypoint-initdb.d/create-wps-databases.sql b/birdhouse/config/postgres/docker-entrypoint-initdb.d/create-wps-databases.sql index 8c7a918bf..903d534fa 100644 --- a/birdhouse/config/postgres/docker-entrypoint-initdb.d/create-wps-databases.sql +++ b/birdhouse/config/postgres/docker-entrypoint-initdb.d/create-wps-databases.sql @@ -1,6 +1,5 @@ CREATE DATABASE flyingpigeon; CREATE DATABASE hummingbird; CREATE DATABASE malleefowl; -CREATE DATABASE catalog; CREATE DATABASE finch; CREATE DATABASE raven; diff --git a/birdhouse/docker-compose.yml b/birdhouse/docker-compose.yml index 4001b4b09..2b4bcb29f 100644 --- a/birdhouse/docker-compose.yml +++ b/birdhouse/docker-compose.yml @@ -100,24 +100,10 @@ services: depends_on: - malleefowl - flyingpigeon - - catalog - proxy restart: always logging: *default-logging - catalog: - image: pavics/pavics-datacatalog:0.6.11 - container_name: catalog - ports: - - "8086:80" - volumes: - - ./config/catalog/catalog.cfg:/home/catalog.cfg - - wps_outputs:/var/www/html/wps_results - depends_on: - - postgres - restart: always - logging: *default-logging - geoserver: image: ${GEOSERVER_IMAGE} container_name: geoserver @@ -242,17 +228,6 @@ services: restart: always logging: *default-logging - solr: - image: pavics/solr:5.2.1 - container_name: solr - ports: - - "8983:8983" - - "48983:9001" - volumes: - - ${DATA_PERSIST_ROOT}/solr:/data - restart: always - logging: *default-logging - ncwms2: image: pavics/ncwms2:2.0.4 container_name: ncwms2 diff --git a/birdhouse/docker/solr/Dockerfile b/birdhouse/docker/solr/Dockerfile deleted file mode 100644 index c938f3ddc..000000000 --- a/birdhouse/docker/solr/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM birdhouse/solr -MAINTAINER st-denis.blaise@ouranos.ca - -COPY immutable_to_mutable.sh /root -COPY mutable_to_immutable.sh /root - -VOLUME /data - -# Ports used in birdhouse -EXPOSE 8983 - -# Start supervisor in foreground -ENV DAEMON_OPTS --nodaemon --user $USER - -# Start service ... -CMD make update-config update-user && /bin/bash /root/immutable_to_mutable.sh && make start diff --git a/birdhouse/docker/solr/immutable_to_mutable.sh b/birdhouse/docker/solr/immutable_to_mutable.sh deleted file mode 100644 index d38efdeeb..000000000 --- a/birdhouse/docker/solr/immutable_to_mutable.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# The path to the schema and config files must be specified in the -# SOLRCONFIGPATH env variable and the core name in SOLRCORE. -#export SOLRCONFIGPATH="/opt/solr/server/solr/core_name/conf" -#export SOLRCORE="core_name" - -# This will slighly mess up the xml indentation. -sed -i $'//c\\\ntrue<\/bool>\\nmanaged-schema<\/str>\\n<\/schemaFactory>' /opt/conda/envs/birdhouse/var/lib/solr/birdhouse/conf/solrconfig.xml -sed -i '/<\/processor>-->/c\<\/processor>' /opt/conda/envs/birdhouse/var/lib/solr/birdhouse/conf/solrconfig.xml -sed -i '//" /opt/conda/envs/birdhouse/var/lib/solr/birdhouse/conf/solrconfig.xml - sed -i '//c\