diff --git a/.github/workflows/apply-geoserver-config-dev.yml b/.github/workflows/apply-geoserver-config-dev.yml index ab4b7746..f4b039f0 100644 --- a/.github/workflows/apply-geoserver-config-dev.yml +++ b/.github/workflows/apply-geoserver-config-dev.yml @@ -26,6 +26,7 @@ jobs: GEOSERVER_DOMAIN: "https://geoserver.dev.digitalearth.africa" GEOSERVER_CONFIG_GIT_BRANCH: ${{ github.head_ref || github.ref_name }} GEOSERVER_ENV: "dev" + GEOSERVER_DB_DATABASE: ${{ secrets.GEOSERVER_DB_DATABASE }} DB_HOST: ${{ secrets.DEV_DB_HOST }} DB_USER: ${{ secrets.DEV_DB_USER }} DB_PASSWORD: ${{ secrets.DEV_DB_PASSWORD }} @@ -45,6 +46,7 @@ jobs: -e GEOSERVER_COLLECTION_LIST=${{ env.GEOSERVER_COLLECTION_LIST }} \ -e GEOSERVER_CONFIG_GIT_BRANCH=${{ env.GEOSERVER_CONFIG_GIT_BRANCH }} \ -e GEOSERVER_ENV=${{ env.GEOSERVER_ENV }} \ + -e GEOSERVER_DB_DATABASE=${{ env.GEOSERVER_DB_DATABASE }} \ -e DB_HOST=${{ env.DB_HOST }} \ -e DB_USER=${{ env.DB_USER }} \ -e DB_PASSWORD=${{ env.DB_PASSWORD }} \ diff --git a/.github/workflows/apply-geoserver-config-prod.yml b/.github/workflows/apply-geoserver-config-prod.yml index 89d358d2..531cea24 100644 --- a/.github/workflows/apply-geoserver-config-prod.yml +++ b/.github/workflows/apply-geoserver-config-prod.yml @@ -27,6 +27,7 @@ jobs: GEOSERVER_DOMAIN: "https://geoserver.digitalearth.africa" GEOSERVER_CONFIG_GIT_BRANCH: ${{ github.head_ref || github.ref_name }} GEOSERVER_ENV: "prod" + GEOSERVER_DB_DATABASE: ${{ secrets.GEOSERVER_DB_DATABASE }} DB_HOST: ${{ secrets.PROD_DB_HOST }} DB_USER: ${{ secrets.PROD_DB_USER }} DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }} @@ -46,6 +47,7 @@ jobs: -e GEOSERVER_COLLECTION_LIST=${{ env.GEOSERVER_COLLECTION_LIST }} \ -e GEOSERVER_CONFIG_GIT_BRANCH=${{ env.GEOSERVER_CONFIG_GIT_BRANCH }} \ -e GEOSERVER_ENV=${{ env.GEOSERVER_ENV }} \ + -e GEOSERVER_DB_DATABASE=${{ env.GEOSERVER_DB_DATABASE }} \ -e DB_HOST=${{ env.DB_HOST }} \ -e DB_USER=${{ env.DB_USER }} \ -e DB_PASSWORD=${{ env.DB_PASSWORD }} \ diff --git a/geoserver/geoserver_data/collections/africapolis/featuretypes/africapolis_2015.json b/geoserver/geoserver_data/collections/africapolis/featuretypes/africapolis_2015.json index b519d7d0..dd3f51d3 100644 --- a/geoserver/geoserver_data/collections/africapolis/featuretypes/africapolis_2015.json +++ b/geoserver/geoserver_data/collections/africapolis/featuretypes/africapolis_2015.json @@ -1,6 +1,6 @@ { "featureType": { - "name": "africapolis_2015", + "name": "Africapolis_2015", "nativeName": "africapolis_2015", "namespace": { "name": "africapolis" diff --git a/geoserver/geoserver_data/collections/africapolis/featuretypes/africapolis_2020.json b/geoserver/geoserver_data/collections/africapolis/featuretypes/africapolis_2020.json index dd7c3c76..91bb172b 100644 --- a/geoserver/geoserver_data/collections/africapolis/featuretypes/africapolis_2020.json +++ b/geoserver/geoserver_data/collections/africapolis/featuretypes/africapolis_2020.json @@ -1,6 +1,6 @@ { "featureType": { - "name": "africapolis_2020", + "name": "Africapolis_2020", "nativeName": "africapolis_2020", "namespace": { "name": "africapolis" diff --git a/geoserver/geoserver_data/inventory/dev/inventory.json b/geoserver/geoserver_data/inventory/dev/inventory.json index faca61ec..dc1b18a6 100644 --- a/geoserver/geoserver_data/inventory/dev/inventory.json +++ b/geoserver/geoserver_data/inventory/dev/inventory.json @@ -1 +1 @@ -["coastlines","waterbodies"] \ No newline at end of file +["coastlines","waterbodies","africapolis"] \ No newline at end of file diff --git a/geoserver/geoserver_data/inventory/prod/inventory.json b/geoserver/geoserver_data/inventory/prod/inventory.json index faca61ec..dc1b18a6 100644 --- a/geoserver/geoserver_data/inventory/prod/inventory.json +++ b/geoserver/geoserver_data/inventory/prod/inventory.json @@ -1 +1 @@ -["coastlines","waterbodies"] \ No newline at end of file +["coastlines","waterbodies","africapolis"] \ No newline at end of file