diff --git a/deploy/nightly/deploy-nightly.sh b/deploy/nightly/deploy-nightly.sh index 98c4d0a9..ab609aba 100644 --- a/deploy/nightly/deploy-nightly.sh +++ b/deploy/nightly/deploy-nightly.sh @@ -32,7 +32,7 @@ BASEDIR=/data/web/msc-pygeoapi-nightly PYGEOAPI_GITREPO=https://github.com/geopython/pygeoapi.git MSC_PYGEOAPI_GITREPO=https://github.com/ECCC-MSC/msc-pygeoapi.git DAYSTOKEEP=7 -export MSC_PYGEOAPI_OGC_API_URL=https://geomet-dev-21-nightly.cmc.ec.gc.ca/msc-pygeoapi/nightly/latest/ +export MSC_PYGEOAPI_OGC_API_URL=https://geomet-dev-22-nightly.cmc.ec.gc.ca/msc-pygeoapi/nightly/latest/ export MSC_PYGEOAPI_ES_URL=http://localhost:9200 export MSC_PYGEOAPI_OGC_API_URL_BASEPATH=/ export MSC_PYGEOAPI_TEMPLATES=/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/theme/templates diff --git a/deploy/nightly/msc-pygeoapi.wsgi b/deploy/nightly/msc-pygeoapi.wsgi index aca86e4a..ac20cc94 100644 --- a/deploy/nightly/msc-pygeoapi.wsgi +++ b/deploy/nightly/msc-pygeoapi.wsgi @@ -49,7 +49,7 @@ import sys os.environ['PYGEOAPI_CONFIG'] = '/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/deploy/nightly/msc-pygeoapi-config.yml' os.environ['PYGEOAPI_OPENAPI'] = '/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/deploy/nightly/msc-pygeoapi-openapi.yml' os.environ['MSC_PYGEOAPI_ES_URL'] = 'http://localhost:9200' -os.environ['MSC_PYGEOAPI_OGC_API_URL'] = 'https://geomet-dev-21-nightly.cmc.ec.gc.ca/msc-pygeoapi/nightly/latest' +os.environ['MSC_PYGEOAPI_OGC_API_URL'] = 'https://geomet-dev-22-nightly.cmc.ec.gc.ca/msc-pygeoapi/nightly/latest' os.environ['MSC_PYGEOAPI_OGC_API_URL_BASEPATH'] = '/' os.environ['MSC_PYGEOAPI_TEMPLATES'] = '/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/theme/templates' os.environ['MSC_PYGEOAPI_STATIC'] = '/data/web/msc-pygeoapi-nightly/latest/msc-pygeoapi/theme/static' diff --git a/docker/README.md b/docker/README.md index 3360ff82..67fcf306 100644 --- a/docker/README.md +++ b/docker/README.md @@ -15,7 +15,7 @@ docker compose -f docker/docker-compose.yml -f docker/docker-compose.override.ym # test OGC API endpoint ```bash -curl "http://geomet-dev-21.cmc.ec.gc.ca:5089" +curl "http://geomet-dev-22.cmc.ec.gc.ca:5089" # or -curl "https://geomet-dev-21-nightly.cmc.ec.gc.ca/msc-pygeoapi" +curl "https://geomet-dev-22-nightly.cmc.ec.gc.ca/msc-pygeoapi" ``` diff --git a/docker/default.env b/docker/default.env index 6cdf9050..1d2a058b 100644 --- a/docker/default.env +++ b/docker/default.env @@ -1,9 +1,9 @@ BASEDIR=/data/web/msc-pygeoapi-nightly PYGEOAPI_CONFIG=${BASEDIR}/msc-pygeoapi/deploy/default/msc-pygeoapi-config.yml PYGEOAPI_OPENAPI=${BASEDIR}/msc-pygeoapi/deploy/nightly/msc-pygeoapi-openapi.yml -# MSC_PYGEOAPI_OGC_API_URL=http://geomet-dev-21.cmc.ec.gc.ca:5089 +# MSC_PYGEOAPI_OGC_API_URL=http://geomet-dev-22.cmc.ec.gc.ca:5089 # MSC_PYGEOAPI_OGC_API_URL_BASEPATH=/ -MSC_PYGEOAPI_OGC_API_URL=https://geomet-dev-21-nightly.cmc.ec.gc.ca/msc-pygeoapi +MSC_PYGEOAPI_OGC_API_URL=https://geomet-dev-22-nightly.cmc.ec.gc.ca/msc-pygeoapi MSC_PYGEOAPI_OGC_API_URL_BASEPATH=/ # MSC_PYGEOAPI_ES_USERNAME=foo # MSC_PYGEOAPI_ES_PASSWORD=bar diff --git a/msc_pygeoapi/process/weather/README.md b/msc_pygeoapi/process/weather/README.md index 61fbdb14..1e2d0607 100644 --- a/msc_pygeoapi/process/weather/README.md +++ b/msc_pygeoapi/process/weather/README.md @@ -55,7 +55,7 @@ Fifth start pygeoapi ```bash pygeoapi serve ``` -Visit http://geomet-dev-21.cmc.ec.gc.ca:5000 +Visit http://geomet-dev-22.cmc.ec.gc.ca:5000 Note: port 5000 is default port. Check `/deploy/default/msc-pygeoapi-config.yml` to double check port diff --git a/requirements.txt b/requirements.txt index 97ae0ab1..f6d114f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,5 @@ rasterio requests sqlalchemy unicodecsv -urllib3<2 +urllib3>=1.26.2,<2 xarray<2023.2.0