Upgrade to 2.9.rc.95

camptocamp · Mar 11, 2025 · 11b9935 · 11b9935
1 parent 44dbba1
commit 11b9935
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/CONST_create_template/docker-compose-lib.yaml b/CONST_create_template/docker-compose-lib.yaml
@@ -199,6 +199,8 @@ services:
       - DEVELOPMENT
       - VISIBLE_ENTRY_POINT
       - TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml
+      - TILECLOUD_CHAIN_SESSION_SECRET
+      - TILECLOUD_CHAIN_SESSION_SALT
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AZURE_STORAGE_CONNECTION_STRING

diff --git a/CONST_create_template/env.default b/CONST_create_template/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.94
+GEOMAPFISH_VERSION=2.9.rc.95
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish
@@ -43,6 +43,9 @@ GEOPORTAL_INTERNAL_PORT=8080
 TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
 TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
 TILECLOUDCHAIN_INTERNAL_PORT=8080
+TILECLOUD_CHAIN_SESSION_SECRET=secret
+TILECLOUD_CHAIN_SESSION_SALT=secret
+
 # For internal print
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/

diff --git a/CONST_create_template/env.project b/CONST_create_template/env.project
@@ -40,10 +40,6 @@ TILEGENERATION_SQS_QUEUE=<queue_name>
 TILEGENERATION_S3_BUCKET=<bucket_name>
 TILEGENERATION_AZURE_CONTAINER=<container_name>
 
-# Should be filed with a strong secret, with e.g. `pwgen --secure 16`
-# TILECLOUD_CHAIN_SESSION_SECRET=
-# TILECLOUD_CHAIN_SESSION_SALT=
-
 # For production
 # FRONT_INNER_PORT=80
 # FRONT_CONFIG=haproxy

diff --git a/CONST_create_template/project.yaml b/CONST_create_template/project.yaml
@@ -10,6 +10,8 @@ template_vars:
   srid: 2056
   extent: 2489246,1078873,2837119,1296543
   authtkt_secret: io7heoDui8xaikie1rushaeGeiph8Bequei6ohchaequob6viejei0xooWeuvohf
+  tilecloud_chain_session_secret: secret
+  tilecloud_chain_session_salt: secret
 env:
   files:
     - env.default

diff --git a/docker-compose-lib.yaml b/docker-compose-lib.yaml
@@ -199,6 +199,8 @@ services:
       - DEVELOPMENT
       - VISIBLE_ENTRY_POINT
       - TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml
+      - TILECLOUD_CHAIN_SESSION_SECRET
+      - TILECLOUD_CHAIN_SESSION_SALT
       - AWS_ACCESS_KEY_ID
       - AWS_SECRET_ACCESS_KEY
       - AZURE_STORAGE_CONNECTION_STRING

diff --git a/env.default b/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.94
+GEOMAPFISH_VERSION=2.9.rc.95
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish
@@ -43,6 +43,9 @@ GEOPORTAL_INTERNAL_PORT=8080
 TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
 TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
 TILECLOUDCHAIN_INTERNAL_PORT=8080
+TILECLOUD_CHAIN_SESSION_SECRET=secret
+TILECLOUD_CHAIN_SESSION_SALT=secret
+
 # For internal print
 MAPSERVER_URL=http://mapserver:8080/
 TINYOWS_URL=http://tinyows:8080/

diff --git a/env.project b/env.project
@@ -40,10 +40,6 @@ TILEGENERATION_SQS_QUEUE=geomapfish-demo-stretch
 TILEGENERATION_S3_BUCKET=tiles-gmf-demo
 TILEGENERATION_AZURE_CONTAINER=tiles-gmf-demo
 
-# Should be filed with a strong secret, with e.g. `pwgen --secure 16`
-# TILECLOUD_CHAIN_SESSION_SECRET=
-# TILECLOUD_CHAIN_SESSION_SALT=
-
 # For production
 # FRONT_INNER_PORT=80
 # FRONT_CONFIG=haproxy

diff --git a/project.yaml b/project.yaml
@@ -37,6 +37,8 @@ template_vars:
   srid: 2056
   extent: 2489246,1078873,2837119,1296543
   authtkt_secret: io7heoDui8xaikie1rushaeGeiph8Bequei6ohchaequob6viejei0xooWeuvohf
+  tilecloud_chain_session_secret: secret
+  tilecloud_chain_session_salt: secret
 env:
   files:
     - env.default