diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f3efb4913..8673c7556 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -8,8 +8,6 @@ on: env: PROJECT: demo HAS_SECRETS: ${{ secrets.HAS_SECRETS }} - # SENTRY_PROJECT: geomapfish-demo - # SENTRY_ENVIRONMENT: prod-2-8 jobs: main: @@ -105,15 +103,6 @@ jobs: - name: Publish run: c2cciutils-publish - # - name: Create Sentry release - # uses: getsentry/action-release@v1 - # env: - # SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - # SENTRY_ORG: camptocamp - # SENTRY_PROJECT: ${{ env.SENTRY_PROJECT }} - # with: - # environment: ${{ env.SENTRY_ENVIRONMENT }} - # if: github.ref == 'refs/heads/prod-2-8' - run: git diff --exit-code --patch > /tmp/dpkg-versions.patch || true if: failure() - uses: actions/upload-artifact@v4 diff --git a/Makefile b/Makefile index f5600170b..01528b407 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PROJECT_PUBLIC_URL=https://geomapfish-demo-2-8.camptocamp.com/ +PROJECT_PUBLIC_URL=https://geomapfish-demo-2-9.camptocamp.com/ DUMP_FILE=data/prod-2-7.dump PACKAGE=geomapfish LANGUAGES=en fr de it diff --git a/geoportal/vars.yaml b/geoportal/vars.yaml index 06b954b7b..9b587e0cf 100644 --- a/geoportal/vars.yaml +++ b/geoportal/vars.yaml @@ -1072,7 +1072,7 @@ runtime_environment: - name: AWS_S3_ENDPOINT default: xxx - name: WMTS_URL - default: https://geomapfish-demo-2-8.camptocamp.com/tiles/1.0.0/WMTSCapabilities.xml + default: https://geomapfish-demo-2-9.camptocamp.com/tiles/1.0.0/WMTSCapabilities.xml - name: REDIS_PASSWORD default: '' - name: REDIS_SSL diff --git a/print/print-apps/geomapfish/config.yaml.tmpl b/print/print-apps/geomapfish/config.yaml.tmpl index 2650b0ad0..fca7c0a11 100644 --- a/print/print-apps/geomapfish/config.yaml.tmpl +++ b/print/print-apps/geomapfish/config.yaml.tmpl @@ -27,13 +27,13 @@ allowedReferers: &allowedHosts ${DISABLE_LOCAL_PRINT}- !hostnameMatch ${DISABLE_LOCAL_PRINT} host: ${VISIBLE_WEB_HOST} - !hostnameMatch - host: geomapfish-demo-2-8.camptocamp.com + host: geomapfish-demo-2-9.camptocamp.com - !hostnameMatch - host: '2-8.geomapfish-demo.prod.apps.gs-ch-prod.camptocamp.com' + host: '2-9.geomapfish-demo.prod.apps.gs-ch-prod.camptocamp.com' - !hostnameMatch - host: '2-8.geomapfish-demo.prod.apps.blue.gs-ch-prod.camptocamp.com' + host: '2-9.geomapfish-demo.prod.apps.blue.gs-ch-prod.camptocamp.com' - !hostnameMatch - host: '2-8.geomapfish-demo.prod.apps.green.gs-ch-prod.camptocamp.com' + host: '2-9.geomapfish-demo.prod.apps.green.gs-ch-prod.camptocamp.com' - !hostnameMatch host: camptocamp.github.io - !hostnameMatch diff --git a/print/print-apps/geomapfish/requestDataA4Portrait.json b/print/print-apps/geomapfish/requestDataA4Portrait.json index f07e58757..df3196207 100644 --- a/print/print-apps/geomapfish/requestDataA4Portrait.json +++ b/print/print-apps/geomapfish/requestDataA4Portrait.json @@ -8,7 +8,7 @@ "scale": 5000, "layers": [ { - "baseURL": "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy", + "baseURL": "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy", "imageFormat": "image/png", "layers": ["osm_hospitals", "osm_firestations", "landuse", "railways"], "customParams": { @@ -23,7 +23,7 @@ "useNativeAngle": true }, { - "baseURL": "https://geomapfish-demo-2-8.camptocamp.com/tiles/1.0.0/map/default/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png", + "baseURL": "https://geomapfish-demo-2-9.camptocamp.com/tiles/1.0.0/map/default/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png", "dimensions": [], "dimensionParams": {}, "imageFormat": "image/png", @@ -146,25 +146,25 @@ { "name": "Hôpitaux OSM", "icons": [ - "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=osm_hospitals&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" + "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=osm_hospitals&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" ] }, { "name": "Caserne de pompiers OSM", "icons": [ - "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=osm_firestations&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" + "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=osm_firestations&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" ] }, { "name": "Utilisation du sol", "icons": [ - "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=landuse&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" + "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=landuse&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" ] }, { "name": "Voies ferrées", "icons": [ - "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=railways&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" + "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=railways&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" ] } ] diff --git a/print/print-apps/geomapfish/requestDataEN.json b/print/print-apps/geomapfish/requestDataEN.json index d6eba2846..a38ee0a6f 100644 --- a/print/print-apps/geomapfish/requestDataEN.json +++ b/print/print-apps/geomapfish/requestDataEN.json @@ -8,7 +8,7 @@ "scale": 5000, "layers": [ { - "baseURL": "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy", + "baseURL": "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy", "imageFormat": "image/png", "layers": ["osm_hospitals", "osm_firestations", "landuse", "railways"], "customParams": { @@ -23,7 +23,7 @@ "useNativeAngle": true }, { - "baseURL": "https://geomapfish-demo-2-8.camptocamp.com/tiles/1.0.0/map/default/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png", + "baseURL": "https://geomapfish-demo-2-9.camptocamp.com/tiles/1.0.0/map/default/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png", "dimensions": [], "dimensionParams": {}, "imageFormat": "image/png", @@ -146,25 +146,25 @@ { "name": "Hôpitaux OSM", "icons": [ - "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=osm_hospitals&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" + "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=osm_hospitals&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" ] }, { "name": "Caserne de pompiers OSM", "icons": [ - "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=osm_firestations&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" + "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=osm_firestations&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" ] }, { "name": "Utilisation du sol", "icons": [ - "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=landuse&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" + "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=landuse&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" ] }, { "name": "Voies ferrées", "icons": [ - "https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=railways&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" + "https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cfe127c3bd2c4d3a80c3f37d6c4eca1a&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=railways&SCALE=5000&DPI=254&BBOX=537178.3590643996%2C151932.4472046311%2C538157.3193556535%2C153123.07458588586&SRS=EPSG%3A2056&WIDTH=1958&HEIGHT=2381" ] } ]