Skip to content

Commit c265273

Browse files
tlvutlvu
committed
optional-components: rename finch2 to generic_bird to make clear is is generic and not related to Finch
1 parent 7f8b186 commit c265273

File tree

10 files changed

+45
-42
lines changed

10 files changed

+45
-42
lines changed

‎birdhouse/common.env‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
export DOCKER_NOTEBOOK_IMAGE="pavics/workflow-tests:200312"
55

66
export FINCH_IMAGE="birdhouse/finch:version-0.5.2"
7-
export FINCH2_IMAGE="$FINCH_IMAGE"
8-
export FINCH2_PORT="8010"
9-
export FINCH2_NAME="finch2"
7+
export GENERIC_BIRD_IMAGE="$FINCH_IMAGE"
8+
export GENERIC_BIRD_PORT="8010"
9+
export GENERIC_BIRD_NAME="generic_bird"
1010

1111
# Folder on the host to persist Jupyter user data (noteboooks, HOME settings)
1212
export JUPYTERHUB_USER_DATA_DIR="/data/jupyterhub_user_data"

‎birdhouse/optional-components/README.md‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,21 @@ No Twitcher/Magpie access control, this Test Thredds is directly behind the
5353
Nginx proxy.
5454

5555

56-
## A second Finch server for testing
56+
## A generic bird WPS service
57+
58+
Can be used to quickly deploy any birds temporarily without changing code.
59+
Good to preview new birds or test alternative configuration of existing birds.
5760

5861
How to enable in `env.local` (a copy from
5962
[`env.local.example`](../env.local.example)):
6063

61-
* Add `./optional-components/finch2` to `EXTRA_CONF_DIRS`.
64+
* Add `./optional-components/generic_bird` to `EXTRA_CONF_DIRS`.
6265

63-
* Optionally set `FINCH2_IMAGE`, `FINCH2_PORT`, `FINCH2_NAME` in `env.local`
66+
* Optionally set `GENERIC_BIRD_IMAGE`, `GENERIC_BIRD_PORT`, `GENERIC_BIRD_NAME` in `env.local`
6467
for further customizations. Default values are in [`common.env`](../common.env).
6568

66-
Second Finch service will be available at `http://PAVICS_FQDN:FINCH2_PORT/wps`
67-
or `https://PAVICS_FQDN_PUBLIC/TWITCHER_PROTECTED_PATH/FINCH2_NAME` where
69+
The WPS service will be available at `http://PAVICS_FQDN:GENERIC_BIRD_PORT/wps`
70+
or `https://PAVICS_FQDN_PUBLIC/TWITCHER_PROTECTED_PATH/GENERIC_BIRD_NAME` where
6871
`PAVICS_FQDN`, `PAVICS_FQDN_PUBLIC` and `TWITCHER_PROTECTED_PATH` are defined
6972
in your `env.local`.
7073

@@ -75,6 +78,6 @@ self-contained and to allow experimenting with different versions of Postgres
7578
DB.
7679

7780
Magpie will be automatically configured to give complete public anonymous
78-
access for this second Finch.
81+
access for this WPS service.
7982

80-
Canarie monitoring will also be automatically configured for this second Finch.
83+
Canarie monitoring will also be automatically configured for this WPS service.

‎birdhouse/optional-components/finch2/.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
wps.cfg
2-
finch2-magpie-permission.cfg
3-
finch2-magpie-provider.cfg
4-
finch2_canarie_api_monitoring.py
2+
generic_bird-magpie-permission.cfg
3+
generic_bird-magpie-provider.cfg
4+
generic_bird_canarie_api_monitoring.py

‎birdhouse/optional-components/finch2/docker-compose-extra.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
version: '2.1'
22
services:
3-
finch2:
4-
image: ${FINCH2_IMAGE}
5-
container_name: finch2
3+
generic_bird:
4+
image: ${GENERIC_BIRD_IMAGE}
5+
container_name: generic_bird
66
environment:
77
PYWPS_CFG: /wps.cfg
88
ports:
9-
- "${FINCH2_PORT}:${FINCH2_INTERNAL_PORT:-5000}"
9+
- "${GENERIC_BIRD_PORT}:${GENERIC_BIRD_INTERNAL_PORT:-5000}"
1010
volumes:
11-
- ./optional-components/finch2/wps.cfg:/wps.cfg:ro
11+
- ./optional-components/generic_bird/wps.cfg:/wps.cfg:ro
1212
- wps_outputs:/data/wpsoutputs
1313
- /tmp
1414
links:
15-
- postgres_finch2
15+
- postgres_generic_bird
1616
restart: always
1717

18-
postgres_finch2:
19-
image: ${FINCH2_POSTGRES_IMAGE:-postgres:10.12}
20-
container_name: postgres_finch2
18+
postgres_generic_bird:
19+
image: ${GENERIC_BIRD_POSTGRES_IMAGE:-postgres:10.12}
20+
container_name: postgres_generic_bird
2121
volumes:
22-
- postgres_finch2:/var/lib/postgresql/data/pgdata
23-
- ./optional-components/finch2/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
22+
- postgres_generic_bird:/var/lib/postgresql/data/pgdata
23+
- ./optional-components/generic_bird/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
2424
environment:
2525
PGDATA: /var/lib/postgresql/data/pgdata
2626
env_file:
@@ -29,12 +29,12 @@ services:
2929

3030
magpie:
3131
volumes:
32-
- ./optional-components/finch2/finch2-magpie-permission.cfg:/opt/local/src/magpie/config/permissions/finch2-magpie-permission.cfg:ro
33-
- ./optional-components/finch2/finch2-magpie-provider.cfg:/opt/local/src/magpie/config/providers/finch2-magpie-provider.cfg:ro
32+
- ./optional-components/generic_bird/generic_bird-magpie-permission.cfg:/opt/local/src/magpie/config/permissions/generic_bird-magpie-permission.cfg:ro
33+
- ./optional-components/generic_bird/generic_bird-magpie-provider.cfg:/opt/local/src/magpie/config/providers/generic_bird-magpie-provider.cfg:ro
3434

3535
proxy:
3636
volumes:
37-
- ./optional-components/finch2/finch2_canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch2_canarie_api_monitoring.py:ro
37+
- ./optional-components/generic_bird/generic_bird_canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/generic_bird_canarie_api_monitoring.py:ro
3838

3939
volumes:
40-
postgres_finch2: {}
40+
postgres_generic_bird: {}

‎birdhouse/optional-components/finch2/finch2-magpie-permission.cfg.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
permissions:
2-
- service: ${FINCH2_NAME}
2+
- service: ${GENERIC_BIRD_NAME}
33
permission: getcapabilities
44
group: anonymous
55
action: create
66

7-
- service: ${FINCH2_NAME}
7+
- service: ${GENERIC_BIRD_NAME}
88
permission: describeprocess
99
group: anonymous
1010
action: create
1111

12-
- service: ${FINCH2_NAME}
12+
- service: ${GENERIC_BIRD_NAME}
1313
permission: execute
1414
group: anonymous
1515
action: create

‎birdhouse/optional-components/finch2/finch2-magpie-provider.cfg.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
providers:
2-
${FINCH2_NAME}:
3-
url: http://${PAVICS_FQDN}:${FINCH2_PORT}/wps
4-
title: ${FINCH2_NAME}
2+
${GENERIC_BIRD_NAME}:
3+
url: http://${PAVICS_FQDN}:${GENERIC_BIRD_PORT}/wps
4+
title: ${GENERIC_BIRD_NAME}
55
public: true
66
c4i: false
77
type: wps

‎birdhouse/optional-components/finch2/finch2_canarie_api_monitoring.py.template‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
SERVICES['node']['monitoring'].update({
2-
'${FINCH2_NAME}-public': {
2+
'${GENERIC_BIRD_NAME}-public': {
33
'request': {
4-
'url': 'https://${PAVICS_FQDN_PUBLIC}/${TWITCHER_PROTECTED_PATH}/${FINCH2_NAME}?service=WPS&version=1.0.0&request=GetCapabilities'
4+
'url': 'https://${PAVICS_FQDN_PUBLIC}/${TWITCHER_PROTECTED_PATH}/${GENERIC_BIRD_NAME}?service=WPS&version=1.0.0&request=GetCapabilities'
55
},
66
},
7-
'${FINCH2_NAME}': {
7+
'${GENERIC_BIRD_NAME}': {
88
'request': {
9-
'url': 'http://${PAVICS_FQDN}:${FINCH2_PORT}/wps?service=WPS&version=1.0.0&request=GetCapabilities'
9+
'url': 'http://${PAVICS_FQDN}:${GENERIC_BIRD_PORT}/wps?service=WPS&version=1.0.0&request=GetCapabilities'
1010
}
1111
},
1212
})

‎birdhouse/optional-components/finch2/postgres/docker-entrypoint-initdb.d/create-wps-databases.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
CREATE DATABASE finch2;
1+
CREATE DATABASE generic_bird;

‎birdhouse/optional-components/finch2/wps.cfg.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ outputpath = /data/wpsoutputs
44

55
[logging]
66
level = INFO
7-
database=postgresql://${POSTGRES_PAVICS_USERNAME}:${POSTGRES_PAVICS_PASSWORD}@postgres_finch2/finch2
7+
database=postgresql://${POSTGRES_PAVICS_USERNAME}:${POSTGRES_PAVICS_PASSWORD}@postgres_generic_bird/generic_bird
88

99
${EXTRA_PYWPS_CONFIG}

‎birdhouse/pavics-compose.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ OPTIONAL_VARS='
4646
$AUTODEPLOY_PLATFORM_FREQUENCY
4747
$AUTODEPLOY_NOTEBOOK_FREQUENCY
4848
$AUTODEPLOY_EXTRA_SCHEDULER_JOBS
49-
$FINCH2_PORT
50-
$FINCH2_NAME
49+
$GENERIC_BIRD_PORT
50+
$GENERIC_BIRD_NAME
5151
'
5252

5353
# we switch to the real directory of the script, so it still works when used from $PATH

0 commit comments

Comments
 (0)