Upgrade to GeoMpaFish 2.9

CONST_create_template/Dockerfile

@@ -14,7 +14,7 @@ ENV CONFIG_VARS sqlalchemy.url sqlalchemy.pool_recycle sqlalchemy.pool_size sqla
     dbsessions urllogin host_forward_host headers_whitelist headers_blacklist \
     smtp c2c.base_path welcome_email \
     lingva_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport \
-    vector_tiles i18next main_ogc_server
+    vector_tiles i18next main_ogc_server static_files
 
 COPY . /tmp/config/
 

CONST_create_template/docker-compose.override.sample.yaml

@@ -12,7 +12,7 @@ services:
     # - ./../c2cgeoportal/geoportal/c2cgeoportal_geoportal:/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal
     # - ./../c2cgeoportal/admin/c2cgeoportal_admin:/opt/c2cgeoportal/admin/c2cgeoportal_admin
     command:
-      - /usr/local/bin/pserve
+      - /venv/bin/pserve
       - --reload
       - c2c:///app/development.ini
     environment:

CONST_create_template/tests/test_app.py

@@ -1,3 +1,5 @@
+import time
+
 import pytest
 import requests
 
@@ -25,7 +27,12 @@
 )
 def test_url(url: str, params: dict[str, str], timeout: int) -> None:
     """Tests that some URL didn't return an error."""
-    response = requests.get(url, params=params, verify=False, timeout=timeout)  # nosec
+    for _ in range(6):
+        response = requests.get(url, params=params, verify=False, timeout=timeout)  # nosec
+        if response.status_code == 503:
+            time.sleep(1)
+            continue
+        break
     assert response.status_code == 200, response.text
 
 

Dockerfile

@@ -14,7 +14,7 @@ ENV CONFIG_VARS sqlalchemy.url sqlalchemy.pool_recycle sqlalchemy.pool_size sqla
     dbsessions urllogin host_forward_host headers_whitelist headers_blacklist \
     smtp c2c.base_path welcome_email \
     lingva_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport \
-    vector_tiles i18next main_ogc_server
+    vector_tiles i18next main_ogc_server static_files
 
 COPY . /tmp/config/
 

geoportal/CONST_config-schema.yaml

@@ -121,6 +121,8 @@ mapping:
               layout:
                 type: str
                 default: ngeo
+              html_filename:
+                type: str
       interfaces_config:
         required: True
         type: map

geoportal/CONST_vars.yaml

@@ -73,6 +73,14 @@ vars:
       escapeValue: false
     backend: {}
 
+  static_files:
+    favicon.ico: /etc/geomapfish/static/images/favicon.ico
+    robot.txt: /etc/geomapfish/static/robot.txt
+    api.js: /etc/static-ngeo/api.js
+    api.js.map: /etc/static-ngeo/api.js.map
+    api.css: /etc/static-ngeo/api.css
+    apihelp.html: /etc/geomapfish/static/apihelp/index.html
+
   interfaces_config:
     default:
       constants:

pyproject.toml

@@ -5,12 +5,3 @@ target-version = ['py39']
 [tool.isort]
 profile = "black"
 line_length = 110
-
-[package]
-name = "custom"
-
-[project.entry-points."paste.app_factory"]
-main = "custom:main"
-
-[project.entry-points."console_scripts"]
-custom-initialize-db = "custom.scripts.initialize_db:main"

tests/test_app.py

@@ -33,11 +33,12 @@
 def test_url(url: str, params: dict[str, str], timeout: int) -> None:
     """Tests that some URL didn't return an error."""
     response = None
-    for _ in range(5):
+    for _ in range(6):
         response = requests.get(url, params=params, verify=False, timeout=timeout)  # nosec
-        if response.status_code != 503:
-            break
-        time.sleep(1)
+        if response.status_code == 503:
+            time.sleep(1)
+            continue
+        break
     assert response.status_code == 200, response.text