bird-house · huard · Feb 6, 2023
@@ -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:

@@ -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

@@ -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

@@ -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'

@@ -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
@@ -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

@@ -1,6 +1,5 @@
 CREATE DATABASE flyingpigeon;
 CREATE DATABASE hummingbird;
 CREATE DATABASE malleefowl;
-CREATE DATABASE catalog;
 CREATE DATABASE finch;
 CREATE DATABASE raven;
@@ -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

@@ -1,19 +1,4 @@
 permissions:
- - service: catalog
- permission: getcapabilities
- group: anonymous
- action: create
-
- - service: catalog
- permission: describeprocess
- group: anonymous
- action: create
-
- - service: catalog
- permission: execute
- group: anonymous
- action: create
-
 
  - service: finch
  permission: getcapabilities

@@ -5,11 +5,6 @@ SERVICES['node']['monitoring'].update({
  },
  },
  # 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'

@@ -1,18 +1,5 @@
 version: "3.4"
 services:
- catalog:
- healthcheck:
- test:
- [
- "CMD",
- "python",
- "-c",
- "import requests; \
- assert requests.get('http://localhost?service=WPS&request=GetCapabilities').status_code == 200",
- ]
- interval: 60s
- timeout: 5s
- retries: 2
  finch:
  healthcheck:
  test:

@@ -159,7 +159,7 @@ TIMEWAIT_REUSE=$(/sbin/sysctl -n net.ipv4.tcp_tw_reuse)
 if [ ${TIMEWAIT_REUSE} -eq 0 ]
 then
  echo "${YELLOW}Warning:${NORMAL} the sysctl net.ipv4.tcp_tw_reuse is not enabled"
- echo " It it suggested to set it to 1, otherwise the pavicscrawler may fail"
+ echo " It it suggested to set it to 1, otherwise come components may fail"
 fi
 
 if [ -z "$PAVICS_FQDN_PUBLIC" ]; then

@@ -18,16 +18,6 @@ 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
-
-# For crawler to complete, assuming minimal dataset from bootstrap-testdata so
-# should be super fast to finish crawling.
-sleep 5
-
 # Create test user.
 # Need "optional-components/secure-thredds" activated to pre-create group thredds-secure-authtest-group.
 $THIS_DIR/create-magpie-authtest-user