Skip to content

Commit

Permalink
more comment updates
Browse files Browse the repository at this point in the history
  • Loading branch information
mishaschwartz committed Dec 11, 2023
1 parent a7f1b81 commit 9ff694a
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
[bumpversion:part:releaseTime]
values = 2023-12-08T18:02:01Z

[bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
[bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
search = 'version': '{current_version}'
replace = 'version': '{new_version}'

[bumpversion:file(releaseTime):birdhouse/config/canarie-api/docker_configuration.py.template]
[bumpversion:file(releaseTime):birdhouse/components/canarie-api/docker_configuration.py.template]
parse = 'releaseTime': '(?P<releaseTime>.*)'
serialize = {releaseTime}
replace = {utcnow:%Y-%m-%dT%H:%M:%SZ}
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Note
----

* All WPS requests should be completed within ``proxy_read_timeout`` of the
Nginx proxy, see `nginx.conf`_ (:download:`download <birdhouse/config/proxy/nginx.conf>`).
Nginx proxy, see `nginx.conf`_ (:download:`download <birdhouse/components/proxy/nginx.conf>`).
Any WPS requests that will take longer should use the async mode.

Default value ``PROXY_READ_TIMEOUT_VALUE`` in `default.env`_ (:download:`download <birdhouse/default.env>`).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
proxy:
volumes:
# NOTE:
# Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/config/canarie-api/docker_configuration.py'
# Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/components/canarie-api/docker_configuration.py'
# This ensures that the alphabetical loading order it defines will first load the default configs, then will load
# the Cowbird config, and then all python configuration within 'optional-components/canarie-api-full-monitoring'.
# It is important to load Cowbird before, as the full monitoring need to know if 'Cowbird' service is added to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ services:
twitcher:
volumes:
# NOTE: MagpieAdapter hooks are defined within Magpie config, but it is actually Twitcher proxy that runs them
# target mount location depends on 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable that is found under `birdhouse/config/twitcher/docker-compose-extra.yml`
# target mount location depends on 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable that is found under `birdhouse/components/twitcher/docker-compose-extra.yml`
- ./components/stac/config/magpie/config.yml:/opt/birdhouse/src/magpie/config/stac-config.yml:ro
- ./components/stac/config/magpie/stac_hooks.py:/opt/birdhouse/src/magpie/hooks/stac_hooks.py:ro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
proxy:
volumes:
# NOTE:
# Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/config/canarie-api/docker_configuration.py'
# Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/components/canarie-api/docker_configuration.py'
# This ensures that the alphabetical loading order it defines will first load the default configs, then will load
# the weaver config, and then all python configuration within 'optional-components/canarie-api-full-monitoring'.
# It is important to load Weaver before, as the full monitoring need to know if 'Weaver' service is added to the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

# NOTE:
# this is needed only if not using the location already provided by the core configuration
# see 'birdhouse/config/proxy/conf.d/all-services.include.template'
# see 'birdhouse/components/proxy/conf.d/all-services.include.template'
# location where process job outputs will be accessible
#location ^~ ${WEAVER_WPS_OUTPUTS_PATH}/ {
# alias ${WEAVER_WPS_OUTPUTS_DIR}/;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ services:
twitcher:
volumes:
# NOTE: MagpieAdapter hooks are defined within Magpie config, but it is actually Twitcher proxy that runs them
# target mount location depends on 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable that is found under `birdhouse/config/twitcher/docker-compose-extra.yml`
# target mount location depends on 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable that is found under `birdhouse/components/twitcher/docker-compose-extra.yml`
- ./components/weaver/config/magpie/config.yml:/opt/birdhouse/src/magpie/config/weaver-config.yml:ro
- ./components/weaver/config/magpie/weaver_hooks.py:/opt/birdhouse/src/magpie/hooks/weaver_hooks.py:ro
2 changes: 1 addition & 1 deletion birdhouse/env.local.example
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass
#export THREDDS_SERVICE_DATA_URL_PATH='birdhouse' # this default is for backward compatibility

# Additional catalogs for THREDDS. Add as many datasetScan XML blocks as needed to THREDDS_ADDITIONAL_CATALOG.
# Each block defines a new top-level catalog. See birdhouse/config/thredds/catalog.xml.template for more information.
# Each block defines a new top-level catalog. See birdhouse/components/thredds/catalog.xml.template for more information.
export THREDDS_ADDITIONAL_CATALOG=""
#export THREDDS_ADDITIONAL_CATALOG="
# <datasetScan name='dataset_location_name' ID='dataset_url_path' path='dataset_url_path' location='dataset_location_on_container'>
Expand Down

0 comments on commit 9ff694a

Please sign in to comment.