Interrupted upgrade to 2.7.1.4

.UPGRADE_INSTRUCTIONS

@@ -0,0 +1,6 @@
+Manually apply the ngeo application changes as shown in the `ngeo.diff` file.
+You should apply the changes shown in the diff file on `CONST_create_template/<file>` on your project's `<file>`.
+Some advice to be more efficient: if the changes on a file concern a file that you never customize, you can simply copy the new file from `CONST_create_template` (`cp CONST_create_template/<file> <file>`).You can furthermore add this file to the `unmanaged_files` section of the `project.yaml` file, to avoid its contents appearing in the diff file for the next upgrade.
+Note that you can also apply them using: git apply --3way ngeo.diff
+To continue, type:
+./upgrade 2.7.1.4 10

.upgrade.yaml

@@ -0,0 +1,191 @@
+---
+# The list (by include, exclude) of default files that will not be overwritten by the upgrade.
+# That that can be extended with managed_files or reduced with unmanaged_files from the
+# project.yaml file in the project root directory.
+default_project_file:
+  include:
+    - geoportal/setup\.py
+    - geoportal/vars\.yaml
+    - geoportal/Makefile
+    - geoportal/geomapfish_geoportal/__init__\.py
+    - geoportal/geomapfish_geoportal/templates/.*
+    - geoportal/geomapfish_geoportal/locale/.*
+    - geoportal/geomapfish_geoportal/static/.*
+    - geoportal/geomapfish_geoportal/static-ngeo/.*
+    - print/print-apps/.*
+    - mapserver/.*
+    - tilegeneration/config\.yaml\.tmpl
+    - project\.yaml
+    - docker-compose\.yaml
+    - env\.project
+    - README\.rst
+    - \.github/workflows/main\.yaml
+    - \.github/workflows/rebuild\.yaml
+  exclude:
+    - mapserver/demo\.map\.tmpl
+    - geoportal/geomapfish_geoportal/static-ngeo/js/apps/image/favicon\.ico
+
+# Files ignored when creating the diff files => will just be left untouched.
+no_diff:
+  - .*\.po
+  - CONST_.+
+  - .*/CONST_.+
+
+# Files that will be present in the CONST_create_template but will not be considered in the upgrade.
+# Used to provide the alt applications => does not disturb the user during upgrade.
+extra:
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/mobile_alt\.html\.ejs
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/oeedit\.html\.ejs
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllermobile_alt\.js
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleroeedit\.js
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/mobile_alt\.scss
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_mobile_alt\.scss
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/oeedit\.scss
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_oeedit\.scss
+  - geoportal/interfaces/desktop_alt\.html\.mako
+  - geoportal/geomapfish_geoportal/static/images/background-layer-button\.png
+
+# Automated file system operations:
+# Remove some files or directories:
+#  - action: remove
+#    paths:
+#      - <one file or directory>
+# Move a file:
+#  - action: move
+#    from: <src file>
+#    to: <dst file>
+upgrade_files:
+  - action: remove
+    paths:
+      - docker-run
+      - .config
+      - docker-compose-run
+      - docker-compose-build.yaml
+      - geoportal/jsbuild/
+      - geoportal/{package}_geoportal/templates/api/
+      - geoportal/{package}_geoportal/static/lib/.gitignore
+      - testdb/
+      - vars_convert2tmpl.yaml
+      - CONST_convert2tmpl.mk
+      - CONST_config-schema.yaml
+      - CONST_Makefile
+      - CONST_vars.yaml
+      - project.yaml.mako
+      - geoportal/geomapfish_geoportal/static/apihelp/images
+  - action: move
+    from: .eslintrc
+    to: geoportal/.eslintrc
+  - action: move
+    from: language_mapping
+    to: geoportal/language_mapping
+  - action: move
+    from: lingua-client.cfg
+    to: geoportal/lingua-client.cfg
+  - action: move
+    from: lingua-server.cfg
+    to: geoportal/lingua-server.cfg
+  - action: move
+    from: vars.yaml
+    to: geoportal/vars.yaml
+  - action: move
+    from: geoportal/webpack.apps.js.mako
+    to: geoportal/webpack.apps.js
+  - action: move
+    from: geoportal/Dockerfile.mako
+    to: geoportal/Dockerfile
+  - action: move
+    from: geoportal/development.ini.mako
+    to: geoportal/development.ini
+  - action: move
+    from: geoportal/production.ini.mako
+    to: geoportal/production.ini
+  - action: move
+    from: .env.mako
+    to: .env.sample
+  - action: move
+    from: Dockerfile.mako
+    to: Dockerfile
+  - action: move
+    from: tools/extract-messages.js
+    to: geoportal/tools/extract-messages.js
+  - action: move
+    from: scripts/deploy-docker
+    to: scripts/publish-docker
+  - action: move
+    from: geoportal/geomapfish_geoportal/static-ngeo/api/apihelp/index.html
+    to: geoportal/geomapfish_geoportal/static/apihelp/index.html
+  - action: move
+    from: geoportal/geomapfish_geoportal/static-ngeo/api/apihelp/rainbow-custom.min.js
+    to: geoportal/geomapfish_geoportal/static/apihelp/rainbow-custom.min.js
+  - action: move
+    from: geoportal/geomapfish_geoportal/static-ngeo/api/apihelp/github.css
+    to: geoportal/geomapfish_geoportal/static/apihelp/github.css
+  - action: move
+    from: geoportal/geomapfish_geoportal/static-ngeo/api/apihelp/data.txt
+    to: geoportal/geomapfish_geoportal/static/apihelp/data.txt
+  - action: move
+    from: geoportal/geomapfish_geoportal/static-ngeo/api/apihelp/img
+    to: geoportal/geomapfish_geoportal/static/apihelp/img
+  - action: remove
+    paths:
+      - geoportal/geomapfish_geoportal/static/apihelp/track0.gpx
+      - geoportal/geomapfish_geoportal/static-ngeo/api/apihelp/
+  - action: remove
+    paths:
+      - geoportal/geomapfish_geoportal/static/css/proj.css
+      - geoportal/geomapfish_geoportal/static/css/proj-map.css
+      - geoportal/geomapfish_geoportal/static/css/proj-widgets.css
+      - geoportal/geomapfish_geoportal/static/js/
+  - action: remove
+    paths:
+      - scripts/CONST_clone_schema.sql
+  - action: remove
+    paths:
+      - front
+      - front_dev
+      - bin/entrypoint
+      - bin/eval-templates
+  - action: move
+    from: .env.sample
+    to: env.sample
+  - action: remove
+    paths:
+      - cgxp_revision
+  - action: remove
+    paths:
+      - .circleci/config.yml
+      - .travis.yml
+  - action: move
+    from: env.sample
+    to: env.default
+  - action: remove
+    paths:
+      - mapserver/CONST_example_map
+  - action: remove
+    paths:
+      - geoportal/geomapfish_geoportal/static-ngeo/js/apps/image/crosshair.svg
+  - action: move
+    from: geoportal/geomapfish_geoportal/static-ngeo/js/apps/image/favicon.ico
+    to: geoportal/geomapfish_geoportal/static/images/favicon.ico
+    override: True
+  - action: move
+    from: .github/workflows/ci.yaml
+    to: .github/workflows/main.yaml
+  - action: remove
+    paths:
+      - scripts/publish-docker
+  - action: remove
+    paths:
+      - geoportal/geomapfish_geoportal/locale/.emptyfolder
+  - action: move
+    from: geoportal/.eslintrc
+    to: geoportal/.eslintrc.yaml
+  - action: remove
+    paths:
+      - qgisserver/geomapfish.yaml.tmpl
+  - action: remove
+    paths:
+      - ci/trigger
+  - action: remove
+    paths:
+      - yamllint.yaml

CONST_create_template/env.default

@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.7.1.1
+GEOMAPFISH_VERSION=2.7.1.4
 GEOMAPFISH_MAIN_VERSION=2.7
 GEOMAPFISH_MAIN_MINOR_VERSION=2.7.1
 COMPOSE_PROJECT_NAME=geomapfish

CONST_create_template/geoportal/vars.yaml

@@ -295,6 +295,11 @@ vars:
       #   connection_kwargs:
       #     db: '{REDIS_DB}'
 
+  # This parameter set the list of hosts allowed to use the iframe api.
+  # 'self' will block all external usage, you must add additional hosts separated by space.
+  # see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/frame-ancestors
+  content_security_policy_iframe_api_frame_ancestors: "'self'"
+
   # Control the HTTP headers
   headers:
     dynamic: &header {}

env.default

@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.7.1.1
+GEOMAPFISH_VERSION=2.7.1.4
 GEOMAPFISH_MAIN_VERSION=2.7
 GEOMAPFISH_MAIN_MINOR_VERSION=2.7.1
 COMPOSE_PROJECT_NAME=geomapfish

geoportal/vars.yaml

@@ -710,6 +710,32 @@ vars:
   #   https://www.google-analytics.com/
   #   https://localhost:3001"
 
+<<<<<<< ours
+=======
+  # The dogpile.cache configuration.
+  cache:
+    std:
+      # Standalone version
+      backend: c2cgeoportal.hybrid
+      arguments:
+        host: '{REDIS_HOST}'
+        port: '{REDIS_PORT}'
+        db: '{REDIS_DB}'
+      # Kubernetes version
+      # arguments:
+      #   sentinels:
+      #     - - '{REDIS_HOST}'
+      #       - '{REDIS_PORT}'
+      #   connection_kwargs:
+      #     db: '{REDIS_DB}'
+
+  # This parameter set the list of hosts allowed to use the iframe api.
+  # 'self' will block all external usage, you must add additional hosts separated by space.
+  # see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/frame-ancestors
+  content_security_policy_iframe_api_frame_ancestors: "'self'"
+
+  # Control the HTTP headers
+>>>>>>> theirs
   headers:
     dynamic: &header {}
     index: *header

ngeo.diff

@@ -0,0 +1,16 @@
+diff --git a/geoportal/vars.yaml b/geoportal/vars.yaml
+index 89625dd..dfade1f 100644
+--- a/geoportal/vars.yaml
++++ b/geoportal/vars.yaml
+@@ -295,6 +295,11 @@ vars:
+       #   connection_kwargs:
+       #     db: '{REDIS_DB}'
+
++  # This parameter set the list of hosts allowed to use the iframe api.
++  # 'self' will block all external usage, you must add additional hosts separated by space.
++  # see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/frame-ancestors
++  content_security_policy_iframe_api_frame_ancestors: "'self'"
++
+   # Control the HTTP headers
+   headers:
+     dynamic: &header {}