Skip to content

Commit 8dee4d6

Browse files
author
Continuous integration
committed
Interrupted upgrade to master
1 parent 1241676 commit 8dee4d6

12 files changed

Lines changed: 320 additions & 79 deletions

File tree

‎.UPGRADE_INSTRUCTIONS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
The `create.diff` file is a recommendation of the changes that you should apply to your project.
2+
You should apply the changes shown in the diff file on `CONST_create_template/<file>` on your project's `<file>`.
3+
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.
4+
Note that you can also apply them using: git apply --3way create.diff
5+
To continue, type:
6+
./upgrade 2.10 11

‎.upgrade.yaml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
---
2+
# The list (by include, exclude) of default files that will not be overwritten by the upgrade.
3+
# That that can be extended with managed_files or reduced with unmanaged_files from the
4+
# project.yaml file in the project root directory.
5+
default_project_file:
6+
include:
7+
- geoportal/setup\.py
8+
- geoportal/vars\.yaml
9+
- geoportal/Makefile
10+
- geoportal/geomapfish_geoportal/__init__\.py
11+
- geoportal/geomapfish_geoportal/templates/.*
12+
- geoportal/geomapfish_geoportal/locale/.*
13+
- geoportal/geomapfish_geoportal/static/.*
14+
- geoportal/geomapfish_geoportal/static-ngeo/.*
15+
- print/print-apps/.*
16+
- mapserver/.*
17+
- tilegeneration/config\.yaml\.tmpl
18+
- project\.yaml
19+
- docker-compose\.yaml
20+
- env\.project
21+
- README\.rst
22+
- \.github/workflows/main\.yaml
23+
- \.github/workflows/rebuild\.yaml
24+
exclude:
25+
- mapserver/demo\.map\.tmpl
26+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/image/favicon\.ico
27+
28+
# Files ignored when creating the diff files => will just be left untouched.
29+
no_diff:
30+
- .*\.po
31+
- CONST_.+
32+
- .*/CONST_.+
33+
34+
# Files that will be present in the CONST_create_template but will not be considered in the upgrade.
35+
# Used to provide the alt applications => does not disturb the user during upgrade.
36+
extra:
37+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/mobile_alt\.html\.ejs
38+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/oeedit\.html\.ejs
39+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllermobile_alt\.js
40+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleroeedit\.js
41+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/mobile_alt\.scss
42+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_mobile_alt\.scss
43+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/oeedit\.scss
44+
- geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_oeedit\.scss
45+
- geoportal/interfaces/desktop_alt\.html\.mako
46+
- geoportal/geomapfish_geoportal/static/images/background-layer-button\.png
47+
- tests/test_testapp.py
48+
49+
# Automated file system operations:
50+
# Remove some files or directories:
51+
# - action: remove
52+
# paths:
53+
# - <one file or directory>
54+
# Move a file:
55+
# - action: move
56+
# from: <src file>
57+
# to: <dst file>
58+
upgrade_files:
59+
- action: remove
60+
paths:
61+
- geoportal/tools/extract-messages.js
62+
- action: move
63+
from: geoportal/lingua-server.cfg
64+
to: geoportal/lingva-server.cfg
65+
- action: move
66+
from: geoportal/lingua-client.cfg
67+
to: geoportal/lingva-client.cfg
68+
- action: remove
69+
paths:
70+
- geoportal/.CONST_vars.yaml.swp
71+
- action: remove
72+
paths:
73+
- geoportal/.eslintrc.yaml
74+
- action: move
75+
from: ci/config.yaml
76+
to: .github/publish.yaml

‎CONST_create_template/docker-compose-lib.yaml‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,10 @@ services:
192192
- redis_slave
193193

194194
tilecloudchain:
195-
image: &tilecloudchain-image ghcr.io/camptocamp/tilecloud-chain:1.23
195+
image: &tilecloudchain-image ghcr.io/camptocamp/tilecloud-chain:2.0
196196
user: www-data
197197
restart: unless-stopped
198198
environment:
199-
- DEVELOPMENT
200-
- VISIBLE_ENTRY_POINT
201-
- TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml
202-
- TILECLOUD_CHAIN_SESSION_SECRET
203-
- TILECLOUD_CHAIN_SESSION_SALT
204199
- AWS_ACCESS_KEY_ID
205200
- AWS_SECRET_ACCESS_KEY
206201
- AZURE_STORAGE_CONNECTION_STRING
@@ -209,34 +204,22 @@ services:
209204
- AZURE_STORAGE_ACCESS_KEY
210205
- AZURE_STORAGE_SAS_TOKEN
211206
- AZURE_STORAGE_ACCOUNT_URL
212-
- C2C_BASE_PATH
213-
- C2C_REDIS_URL
214-
- C2C_REDIS_SENTINELS
215-
- C2C_REDIS_TIMEOUT
216-
- C2C_REDIS_SERVICENAME
217-
- C2C_REDIS_DB
218-
- C2C_BASE_PATH=/tiles/c2c
219-
- C2C_BROADCAST_PREFIX=broadcast_tilecloudchain_
220-
- C2C_REQUESTS_DEFAULT_TIMEOUT
221-
- C2C_LOG_VIEW_ENABLED=TRUE
222-
- C2C_DEBUG_VIEW_ENABLED=TRUE
223-
- C2C_SQL_PROFILER_ENABLED=TRUE
224-
- C2C_PROFILER_PATH
225-
- C2C_PROFILER_MODULES
226-
- C2C_SECRET
227-
- C2C_AUTH_GITHUB_REPOSITORY
228-
- C2C_AUTH_GITHUB_ACCESS_TYPE
229-
- C2C_AUTH_GITHUB_CLIENT_ID
230-
- C2C_AUTH_GITHUB_CLIENT_SECRET
231-
- C2C_AUTH_GITHUB_SCOPE
232-
- C2C_AUTH_GITHUB_SECRET
233-
- C2C_AUTH_GITHUB_PROXY_URL
234-
- C2C_USE_SESSION=true
235-
- TILECLOUD_LOG_LEVEL
236-
- TILECLOUD_CHAIN_LOG_LEVEL
237-
- C2CWSGI_LOG_LEVEL
238-
- OTHER_LOG_LEVEL
239-
- LOG_TYPE
207+
- C2C__REDIS__URL=${C2C_REDIS_URL}
208+
- C2C__REDIS__SERVICENAME=${C2C_REDIS_SERVICENAME}
209+
- C2C__REDIS__DB=${C2C_REDIS_SB}
210+
- C2C__REDIS__BROADCAST_PREFIX=broadcast_tilecloudchain_
211+
- C2C__AUTH__GITHUB__REPOSITORY=${C2C_AUTH_GITHUB_REPOSITORY}
212+
- C2C__AUTH__GITHUB__ACCESS_TYPE_READ_WRITE=${C2C_AUTH_GITHUB_ACCESS_TYPE}
213+
- C2C__AUTH__GITHUB__CLIENT_ID=${C2C_AUTH_GITHUB_CLIENT_ID}
214+
- C2C__AUTH__GITHUB__CLIENT_SECRET=${C2C_AUTH_GITHUB_CLIENT_SECRET}
215+
- C2C__AUTH__GITHUB__SCOPE=${C2C_AUTH_GITHUB_SCOPE}
216+
- C2C__AUTH__GITHUB__PROXY_URL=${C2C_AUTH_GITHUB_PROXY_URL}
217+
- TILECLOUD_CHAIN__ROUTE_PREFIX=${VISIBLE_ENTRY_POINT}tiles/
218+
- TILECLOUD_CHAIN__LOGGING__TILECLOUD_LOG_LEVEL=${TILECLOUD_LOG_LEVEL}
219+
- TILECLOUD_CHAIN__LOGGING__TILECLOUD_CHAIN_LOG_LEVEL=${TILECLOUD_CHAIN_LOG_LEVEL}
220+
- TILECLOUD_CHAIN__LOGGING__C2CASGI_LOG_LEVEL=${C2CASGI_LOG_LEVEL}
221+
- TILECLOUD_CHAIN__LOGGING__OTHER_LOG_LEVEL=${OTHER_LOG_LEVEL}
222+
- TILECLOUD_CHAIN__LOGGING__LOG_TYPE=${LOG_TYPE}
240223

241224
tilegeneration_slave:
242225
image: *tilecloudchain-image

‎CONST_create_template/env.default‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ GEOPORTAL_INTERNAL_PORT=8080
4444
TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
4545
TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
4646
TILECLOUDCHAIN_INTERNAL_PORT=8080
47-
TILECLOUD_CHAIN_SESSION_SECRET=H5Fs5M8CqcmsUBK63VcyQV61mQrFEjFgKBmxWh6RN08i5XDn9HxAXUWsAPsVP3iI
48-
TILECLOUD_CHAIN_SESSION_SALT=qSwlASTNDuCNTK9U
4947

5048
# For internal print
5149
MAPSERVER_URL=http://mapserver:8080/
@@ -80,6 +78,7 @@ C2CWSGI_LOG_LEVEL=WARN
8078
TILECLOUD_LOG_LEVEL=INFO
8179
TILECLOUD_CHAIN_LOG_LEVEL=INFO
8280
C2CWSGIUTILS_LOG_LEVEL=INFO
81+
C2CASGIUTILS_LOG_LEVEL=INFO
8382
LOG_TYPE=console
8483

8584
# QGIS

‎CONST_create_template/project.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ template_vars:
1010
srid: 2056
1111
extent: 2489246,1078873,2837119,1296543
1212
authtkt_secret: io7heoDui8xaikie1rushaeGeiph8Bequei6ohchaequob6viejei0xooWeuvohf
13-
tilecloud_chain_session_secret: H5Fs5M8CqcmsUBK63VcyQV61mQrFEjFgKBmxWh6RN08i5XDn9HxAXUWsAPsVP3iI
14-
tilecloud_chain_session_salt: qSwlASTNDuCNTK9U
1513
env:
1614
files:
1715
- env.default

‎CONST_create_template/tilegeneration/config.yaml.tmpl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tilecloud-chain/master/tilecloud_chain/schema.json
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tilecloud-chain/2.0/tilecloud_chain/schema.json
22

33
grids:
44
# grid name, I just recommends to add the min resolution because it's common to not generate all the layers at the same resolution.
@@ -38,7 +38,8 @@ ${DISABLE_LOCAL} host: ${AWS_S3_ENDPOINT}
3838
defaults:
3939
layer: &layer
4040
type: wms
41-
grid: swissgrid_05
41+
grids:
42+
- swissgrid_05
4243
# the minimum resolution to seed, useful to use with mapcache, optional.
4344
# min_resolution_seed: 1
4445
# the URL of the WMS server to used

‎create.diff‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
diff --git a/project.yaml b/project.yaml
2+
index 911cfb5..1e48d6d 100644
3+
--- a/project.yaml
4+
+++ b/project.yaml
5+
@@ -10,8 +10,6 @@ template_vars:
6+
srid: 2056
7+
extent: 2489246,1078873,2837119,1296543
8+
authtkt_secret: io7heoDui8xaikie1rushaeGeiph8Bequei6ohchaequob6viejei0xooWeuvohf
9+
- tilecloud_chain_session_secret: H5Fs5M8CqcmsUBK63VcyQV61mQrFEjFgKBmxWh6RN08i5XDn9HxAXUWsAPsVP3iI
10+
- tilecloud_chain_session_salt: qSwlASTNDuCNTK9U
11+
env:
12+
files:
13+
- env.default
14+
diff --git a/tilegeneration/config.yaml.tmpl b/tilegeneration/config.yaml.tmpl
15+
index a64d766..5cf2840 100644
16+
--- a/tilegeneration/config.yaml.tmpl
17+
+++ b/tilegeneration/config.yaml.tmpl
18+
@@ -1,4 +1,4 @@
19+
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tilecloud-chain/master/tilecloud_chain/schema.json
20+
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tilecloud-chain/2.0/tilecloud_chain/schema.json
21+
22+
grids:
23+
# grid name, I just recommends to add the min resolution because it's common to not generate all the layers at the same resolution.
24+
@@ -38,7 +38,8 @@ ${DISABLE_LOCAL} host: ${AWS_S3_ENDPOINT}
25+
defaults:
26+
layer: &layer
27+
type: wms
28+
- grid: swissgrid_05
29+
+ grids:
30+
+ - swissgrid_05
31+
# the minimum resolution to seed, useful to use with mapcache, optional.
32+
# min_resolution_seed: 1
33+
# the URL of the WMS server to used

‎docker-compose-lib.yaml‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,10 @@ services:
192192
- redis_slave
193193

194194
tilecloudchain:
195-
image: &tilecloudchain-image ghcr.io/camptocamp/tilecloud-chain:1.23
195+
image: &tilecloudchain-image ghcr.io/camptocamp/tilecloud-chain:2.0
196196
user: www-data
197197
restart: unless-stopped
198198
environment:
199-
- DEVELOPMENT
200-
- VISIBLE_ENTRY_POINT
201-
- TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml
202-
- TILECLOUD_CHAIN_SESSION_SECRET
203-
- TILECLOUD_CHAIN_SESSION_SALT
204199
- AWS_ACCESS_KEY_ID
205200
- AWS_SECRET_ACCESS_KEY
206201
- AZURE_STORAGE_CONNECTION_STRING
@@ -209,34 +204,22 @@ services:
209204
- AZURE_STORAGE_ACCESS_KEY
210205
- AZURE_STORAGE_SAS_TOKEN
211206
- AZURE_STORAGE_ACCOUNT_URL
212-
- C2C_BASE_PATH
213-
- C2C_REDIS_URL
214-
- C2C_REDIS_SENTINELS
215-
- C2C_REDIS_TIMEOUT
216-
- C2C_REDIS_SERVICENAME
217-
- C2C_REDIS_DB
218-
- C2C_BASE_PATH=/tiles/c2c
219-
- C2C_BROADCAST_PREFIX=broadcast_tilecloudchain_
220-
- C2C_REQUESTS_DEFAULT_TIMEOUT
221-
- C2C_LOG_VIEW_ENABLED=TRUE
222-
- C2C_DEBUG_VIEW_ENABLED=TRUE
223-
- C2C_SQL_PROFILER_ENABLED=TRUE
224-
- C2C_PROFILER_PATH
225-
- C2C_PROFILER_MODULES
226-
- C2C_SECRET
227-
- C2C_AUTH_GITHUB_REPOSITORY
228-
- C2C_AUTH_GITHUB_ACCESS_TYPE
229-
- C2C_AUTH_GITHUB_CLIENT_ID
230-
- C2C_AUTH_GITHUB_CLIENT_SECRET
231-
- C2C_AUTH_GITHUB_SCOPE
232-
- C2C_AUTH_GITHUB_SECRET
233-
- C2C_AUTH_GITHUB_PROXY_URL
234-
- C2C_USE_SESSION=true
235-
- TILECLOUD_LOG_LEVEL
236-
- TILECLOUD_CHAIN_LOG_LEVEL
237-
- C2CWSGI_LOG_LEVEL
238-
- OTHER_LOG_LEVEL
239-
- LOG_TYPE
207+
- C2C__REDIS__URL=${C2C_REDIS_URL}
208+
- C2C__REDIS__SERVICENAME=${C2C_REDIS_SERVICENAME}
209+
- C2C__REDIS__DB=${C2C_REDIS_SB}
210+
- C2C__REDIS__BROADCAST_PREFIX=broadcast_tilecloudchain_
211+
- C2C__AUTH__GITHUB__REPOSITORY=${C2C_AUTH_GITHUB_REPOSITORY}
212+
- C2C__AUTH__GITHUB__ACCESS_TYPE_READ_WRITE=${C2C_AUTH_GITHUB_ACCESS_TYPE}
213+
- C2C__AUTH__GITHUB__CLIENT_ID=${C2C_AUTH_GITHUB_CLIENT_ID}
214+
- C2C__AUTH__GITHUB__CLIENT_SECRET=${C2C_AUTH_GITHUB_CLIENT_SECRET}
215+
- C2C__AUTH__GITHUB__SCOPE=${C2C_AUTH_GITHUB_SCOPE}
216+
- C2C__AUTH__GITHUB__PROXY_URL=${C2C_AUTH_GITHUB_PROXY_URL}
217+
- TILECLOUD_CHAIN__ROUTE_PREFIX=${VISIBLE_ENTRY_POINT}tiles/
218+
- TILECLOUD_CHAIN__LOGGING__TILECLOUD_LOG_LEVEL=${TILECLOUD_LOG_LEVEL}
219+
- TILECLOUD_CHAIN__LOGGING__TILECLOUD_CHAIN_LOG_LEVEL=${TILECLOUD_CHAIN_LOG_LEVEL}
220+
- TILECLOUD_CHAIN__LOGGING__C2CASGI_LOG_LEVEL=${C2CASGI_LOG_LEVEL}
221+
- TILECLOUD_CHAIN__LOGGING__OTHER_LOG_LEVEL=${OTHER_LOG_LEVEL}
222+
- TILECLOUD_CHAIN__LOGGING__LOG_TYPE=${LOG_TYPE}
240223

241224
tilegeneration_slave:
242225
image: *tilecloudchain-image

‎env.default‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ GEOPORTAL_INTERNAL_PORT=8080
4444
TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
4545
TILECLOUDCHAIN_INTERNAL_HOST=tilecloudchain
4646
TILECLOUDCHAIN_INTERNAL_PORT=8080
47-
TILECLOUD_CHAIN_SESSION_SECRET=H5Fs5M8CqcmsUBK63VcyQV61mQrFEjFgKBmxWh6RN08i5XDn9HxAXUWsAPsVP3iI
48-
TILECLOUD_CHAIN_SESSION_SALT=qSwlASTNDuCNTK9U
4947

5048
# For internal print
5149
MAPSERVER_URL=http://mapserver:8080/
@@ -80,6 +78,7 @@ C2CWSGI_LOG_LEVEL=WARN
8078
TILECLOUD_LOG_LEVEL=INFO
8179
TILECLOUD_CHAIN_LOG_LEVEL=INFO
8280
C2CWSGIUTILS_LOG_LEVEL=INFO
81+
C2CASGIUTILS_LOG_LEVEL=INFO
8382
LOG_TYPE=console
8483

8584
# QGIS

‎project.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ template_vars:
3737
srid: 2056
3838
extent: 2489246,1078873,2837119,1296543
3939
authtkt_secret: io7heoDui8xaikie1rushaeGeiph8Bequei6ohchaequob6viejei0xooWeuvohf
40-
tilecloud_chain_session_secret: H5Fs5M8CqcmsUBK63VcyQV61mQrFEjFgKBmxWh6RN08i5XDn9HxAXUWsAPsVP3iI
41-
tilecloud_chain_session_salt: qSwlASTNDuCNTK9U
4240
env:
4341
files:
4442
- env.default

0 commit comments

Comments
 (0)