c2cgeoportal-geoportal 2.6.0__py2.py3-none-any.whl → 2.7.1.83__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- c2cgeoportal_geoportal/__init__.py +224 -84
- c2cgeoportal_geoportal/lib/__init__.py +64 -42
- c2cgeoportal_geoportal/lib/authentication.py +50 -22
- c2cgeoportal_geoportal/lib/bashcolor.py +17 -13
- c2cgeoportal_geoportal/lib/cacheversion.py +16 -8
- c2cgeoportal_geoportal/lib/caching.py +61 -191
- c2cgeoportal_geoportal/lib/check_collector.py +17 -10
- c2cgeoportal_geoportal/lib/checker.py +61 -63
- c2cgeoportal_geoportal/lib/common_headers.py +170 -0
- c2cgeoportal_geoportal/lib/dbreflection.py +54 -39
- c2cgeoportal_geoportal/lib/filter_capabilities.py +119 -87
- c2cgeoportal_geoportal/lib/fulltextsearch.py +6 -5
- c2cgeoportal_geoportal/lib/functionality.py +20 -17
- c2cgeoportal_geoportal/lib/headers.py +14 -5
- c2cgeoportal_geoportal/lib/i18n.py +4 -4
- c2cgeoportal_geoportal/lib/layers.py +30 -11
- c2cgeoportal_geoportal/lib/lingua_extractor.py +361 -237
- c2cgeoportal_geoportal/lib/loader.py +10 -15
- c2cgeoportal_geoportal/lib/metrics.py +28 -17
- c2cgeoportal_geoportal/lib/oauth2.py +214 -145
- c2cgeoportal_geoportal/lib/wmstparsing.py +115 -90
- c2cgeoportal_geoportal/lib/xsd.py +26 -16
- c2cgeoportal_geoportal/resources.py +15 -9
- c2cgeoportal_geoportal/scaffolds/advance_create/ci/config.yaml +26 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/cookiecutter.json +18 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/.dockerignore +6 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/.eslintrc.yaml +19 -0
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/+dot+prospector.yaml → advance_create/{{cookiecutter.project}}/geoportal/.prospector.yaml} +8 -2
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/Dockerfile_tmpl → advance_create/{{cookiecutter.project}}/geoportal/Dockerfile} +18 -9
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/alembic.yaml_tmpl → advance_create/{{cookiecutter.project}}/geoportal/alembic.yaml} +1 -1
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/development.ini_tmpl → advance_create/{{cookiecutter.project}}/geoportal/development.ini} +34 -15
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/gunicorn.conf.py +104 -0
- c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/lingua-client.cfg +1 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/production.ini +38 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/requirements.txt +2 -0
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/setup.py_tmpl → advance_create/{{cookiecutter.project}}/geoportal/setup.py} +6 -7
- c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/tools/extract-messages.js +8 -6
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/tsconfig.json +8 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.api.js +75 -0
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/webpack.apps.js_tmpl → advance_create/{{cookiecutter.project}}/geoportal/webpack.apps.js} +31 -28
- c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/webpack.commons.js +3 -7
- c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/webpack.config.js +1 -1
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal/__init__.py_tmpl → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/__init__.py} +11 -22
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/authentication.py +10 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/dev.py +14 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/models.py +8 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/multi_organization.py +7 -0
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/resources.py +4 -3
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal/static-ngeo/api/index.js_tmpl → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/index.js} +1 -2
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal/static-ngeo/js/+package+module.js_tmpl → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/js/{{cookiecutter.package}}module.js} +4 -4
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal/subscribers.py_tmpl → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/subscribers.py} +1 -3
- c2cgeoportal_geoportal/scaffolds/advance_update/cookiecutter.json +18 -0
- c2cgeoportal_geoportal/scaffolds/{update/geoportal/CONST_Makefile_tmpl → advance_update/{{cookiecutter.project}}/geoportal/CONST_Makefile} +3 -7
- c2cgeoportal_geoportal/scaffolds/create/cookiecutter.json +18 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.dockerignore +14 -0
- c2cgeoportal_geoportal/scaffolds/create/{+dot+editorconfig → {{cookiecutter.project}}/.editorconfig} +2 -5
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml +43 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/rebuild.yaml +46 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/update_l10n.yaml +65 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.gitignore +16 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.prettierignore +1 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.prettierrc.yaml +2 -0
- c2cgeoportal_geoportal/scaffolds/create/{Dockerfile_tmpl → {{cookiecutter.project}}/Dockerfile} +20 -11
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile +14 -0
- c2cgeoportal_geoportal/scaffolds/create/{README.rst_tmpl → {{cookiecutter.project}}/README.rst} +4 -4
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build +158 -0
- c2cgeoportal_geoportal/scaffolds/create/{ci/config.yaml_tmpl → {{cookiecutter.project}}/ci/config.yaml} +7 -5
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt +1 -0
- c2cgeoportal_geoportal/scaffolds/create/{docker-compose-lib.yaml → {{cookiecutter.project}}/docker-compose-lib.yaml} +133 -17
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml +66 -0
- c2cgeoportal_geoportal/scaffolds/create/{docker-compose.yaml → {{cookiecutter.project}}/docker-compose.yaml} +17 -12
- c2cgeoportal_geoportal/scaffolds/create/{env.default_tmpl → {{cookiecutter.project}}/env.default} +29 -14
- c2cgeoportal_geoportal/scaffolds/create/{env.project_tmpl → {{cookiecutter.project}}/env.project} +16 -4
- c2cgeoportal_geoportal/scaffolds/create/{geoportal/vars.yaml_tmpl → {{cookiecutter.project}}/geoportal/vars.yaml} +93 -27
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/css/mobile.css +0 -0
- c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/data/Readme.txt +1 -1
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/demo.map.tmpl +224 -0
- c2cgeoportal_geoportal/scaffolds/create/{mapserver/mapserver.map.tmpl_tmpl → {{cookiecutter.project}}/mapserver/mapserver.map.tmpl} +7 -15
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A3_Landscape.jrxml +8 -8
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A3_Portrait.jrxml +8 -8
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A4_Landscape.jrxml +8 -8
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A4_Portrait.jrxml +8 -8
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/config.yaml.tmpl +5 -4
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/localisation.properties +4 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/localisation_fr.properties +4 -0
- c2cgeoportal_geoportal/scaffolds/create/{project.yaml_tmpl → {{cookiecutter.project}}/project.yaml} +6 -6
- c2cgeoportal_geoportal/scaffolds/create/{qgisserver/pg_service.conf.tmpl_tmpl → {{cookiecutter.project}}/qgisserver/pg_service.conf.tmpl} +2 -2
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup +107 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore +111 -0
- c2cgeoportal_geoportal/scaffolds/create/{setup.cfg_tmpl → {{cookiecutter.project}}/setup.cfg} +1 -1
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/spell-ignore-words.txt +3 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl +195 -0
- c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json +18 -0
- c2cgeoportal_geoportal/scaffolds/update/{+dot+upgrade.yaml_tmpl → {{cookiecutter.project}}/.upgrade.yaml} +49 -39
- c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt +1153 -0
- c2cgeoportal_geoportal/scaffolds/update/{geoportal → {{cookiecutter.project}}/geoportal}/CONST_config-schema.yaml +47 -2
- c2cgeoportal_geoportal/scaffolds/update/{geoportal/CONST_vars.yaml_tmpl → {{cookiecutter.project}}/geoportal/CONST_vars.yaml} +350 -15
- c2cgeoportal_geoportal/scripts/__init__.py +15 -31
- c2cgeoportal_geoportal/scripts/c2cupgrade.py +271 -232
- c2cgeoportal_geoportal/scripts/create_demo_theme.py +3 -6
- c2cgeoportal_geoportal/scripts/manage_users.py +34 -39
- c2cgeoportal_geoportal/scripts/pcreate.py +312 -0
- c2cgeoportal_geoportal/scripts/theme2fts.py +72 -23
- c2cgeoportal_geoportal/scripts/urllogin.py +17 -9
- c2cgeoportal_geoportal/templates/login.html +88 -84
- c2cgeoportal_geoportal/templates/notlogin.html +59 -59
- c2cgeoportal_geoportal/templates/testi18n.html +6 -8
- c2cgeoportal_geoportal/views/__init__.py +23 -4
- c2cgeoportal_geoportal/views/dev.py +9 -7
- c2cgeoportal_geoportal/views/dynamic.py +54 -18
- c2cgeoportal_geoportal/views/entry.py +93 -24
- c2cgeoportal_geoportal/views/fulltextsearch.py +28 -22
- c2cgeoportal_geoportal/views/geometry_processing.py +15 -7
- c2cgeoportal_geoportal/views/i18n.py +91 -9
- c2cgeoportal_geoportal/views/layers.py +160 -126
- c2cgeoportal_geoportal/views/login.py +106 -93
- c2cgeoportal_geoportal/views/mapserverproxy.py +45 -28
- c2cgeoportal_geoportal/views/memory.py +12 -12
- c2cgeoportal_geoportal/views/ogcproxy.py +48 -30
- c2cgeoportal_geoportal/views/pdfreport.py +26 -22
- c2cgeoportal_geoportal/views/printproxy.py +56 -50
- c2cgeoportal_geoportal/views/profile.py +24 -23
- c2cgeoportal_geoportal/views/proxy.py +84 -67
- c2cgeoportal_geoportal/views/raster.py +35 -24
- c2cgeoportal_geoportal/views/resourceproxy.py +13 -11
- c2cgeoportal_geoportal/views/shortener.py +27 -24
- c2cgeoportal_geoportal/views/theme.py +427 -321
- c2cgeoportal_geoportal/views/tinyowsproxy.py +46 -39
- c2cgeoportal_geoportal/views/vector_tiles.py +80 -0
- {c2cgeoportal_geoportal-2.6.0.dist-info → c2cgeoportal_geoportal-2.7.1.83.dist-info}/METADATA +24 -20
- c2cgeoportal_geoportal-2.7.1.83.dist-info/RECORD +185 -0
- {c2cgeoportal_geoportal-2.6.0.dist-info → c2cgeoportal_geoportal-2.7.1.83.dist-info}/WHEEL +1 -1
- {c2cgeoportal_geoportal-2.6.0.dist-info → c2cgeoportal_geoportal-2.7.1.83.dist-info}/entry_points.txt +3 -1
- tests/__init__.py +7 -3
- tests/test_cachebuster.py +0 -2
- tests/test_caching.py +17 -25
- tests/test_checker.py +0 -2
- tests/test_decimaljson.py +4 -4
- tests/test_headerstween.py +0 -2
- tests/test_i18n.py +1 -1
- tests/test_init.py +4 -7
- tests/test_locale_negociator.py +0 -2
- tests/test_mapserverproxy_route_predicate.py +0 -2
- tests/test_raster.py +0 -2
- tests/test_wmstparsing.py +0 -2
- c2cgeoportal_geoportal/scaffolds/__init__.py +0 -227
- c2cgeoportal_geoportal/scaffolds/create/+dot+dockerignore_tmpl +0 -12
- c2cgeoportal_geoportal/scaffolds/create/+dot+github/workflows/main.yaml_tmpl +0 -89
- c2cgeoportal_geoportal/scaffolds/create/+dot+github/workflows/rebuild.yaml_tmpl +0 -78
- c2cgeoportal_geoportal/scaffolds/create/+dot+gitignore_tmpl +0 -16
- c2cgeoportal_geoportal/scaffolds/create/Makefile +0 -3
- c2cgeoportal_geoportal/scaffolds/create/build_tmpl +0 -167
- c2cgeoportal_geoportal/scaffolds/create/ci/requirements.txt +0 -1
- c2cgeoportal_geoportal/scaffolds/create/ci/trigger +0 -68
- c2cgeoportal_geoportal/scaffolds/create/docker-compose.override.sample.yaml +0 -54
- c2cgeoportal_geoportal/scaffolds/create/geoportal/+dot+dockerignore_tmpl +0 -6
- c2cgeoportal_geoportal/scaffolds/create/geoportal/+dot+eslintrc_tmpl +0 -15
- c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/models.py_tmpl +0 -10
- c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/static/robot.txt +0 -3
- c2cgeoportal_geoportal/scaffolds/create/geoportal/production.ini_tmpl +0 -106
- c2cgeoportal_geoportal/scaffolds/create/geoportal/requirements.txt +0 -2
- c2cgeoportal_geoportal/scaffolds/create/geoportal/tsconfig.json_tmpl +0 -9
- c2cgeoportal_geoportal/scaffolds/create/geoportal/webpack.api.js_tmpl +0 -72
- c2cgeoportal_geoportal/scaffolds/create/mapserver/demo.map.tmpl_tmpl +0 -262
- c2cgeoportal_geoportal/scaffolds/create/mapserver/tinyows.xml +0 -36
- c2cgeoportal_geoportal/scaffolds/create/print/print-apps/+package+/config.yaml +0 -168
- c2cgeoportal_geoportal/scaffolds/create/qgisserver/geomapfish.yaml.tmpl_tmpl +0 -16
- c2cgeoportal_geoportal/scaffolds/create/spell-ignore-words.txt +0 -1
- c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl_tmpl +0 -185
- c2cgeoportal_geoportal/scaffolds/create/yamllint.yaml +0 -11
- c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl +0 -454
- c2cgeoportal_geoportal/templates/dynamic.js +0 -21
- c2cgeoportal_geoportal-2.6.0.dist-info/RECORD +0 -173
- /c2cgeoportal_geoportal/{scaffolds/create/geoportal/+package+_geoportal/static/css/desktop.css → py.typed} +0 -0
- /c2cgeoportal_geoportal/scaffolds/{create/geoportal/Makefile_tmpl → advance_create/{{cookiecutter.project}}/geoportal/Makefile} +0 -0
- /c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/alembic.ini +0 -0
- /c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/language_mapping +0 -0
- /c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/lingua-server.cfg +0 -0
- /c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/views/__init__.py +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal/locale/en/LC_MESSAGES/+package+_geoportal-client.po → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/locale/en/LC_MESSAGES/{{cookiecutter.package}}_geoportal-client.po} +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal/static/css/iframe_api.css → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/css/desktop.css} +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal/static/css/mobile.css → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/css/iframe_api.css} +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/banner_left.png +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/banner_right.png +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/blank.png +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/markers/marker-blue.png +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/markers/marker-gold.png +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/markers/marker-green.png +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/markers/marker.png +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/robot.txt.tmpl +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/data/TM_EUROPE_BORDERS-0.3.sql +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Arial.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Arialbd.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Arialbi.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Ariali.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/NotoSans-Bold.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/NotoSans-BoldItalic.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/NotoSans-Italic.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/NotoSans-Regular.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Verdana.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Verdanab.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Verdanai.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Verdanaz.ttf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts.conf +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/tinyows.xml.tmpl +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/legend.jrxml +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/logo.png +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/north.svg +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/results.jrxml +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{pyproject.toml → {{cookiecutter.project}}/pyproject.toml} +0 -0
- /c2cgeoportal_geoportal/scaffolds/create/{run_alembic.sh → {{cookiecutter.project}}/run_alembic.sh} +0 -0
- {c2cgeoportal_geoportal-2.6.0.dist-info → c2cgeoportal_geoportal-2.7.1.83.dist-info}/top_level.txt +0 -0
@@ -1,11 +1,15 @@
|
|
1
|
-
|
1
|
+
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/master/c2cciutils/schema.json
|
2
|
+
|
2
3
|
checks:
|
3
4
|
black: False
|
4
5
|
isort: False
|
6
|
+
prettier: False
|
5
7
|
codespell: False
|
6
8
|
eof: False
|
7
9
|
required_workflows: False
|
8
10
|
dependabot_config: False
|
11
|
+
prospector_config: False
|
12
|
+
setup: False
|
9
13
|
|
10
14
|
version:
|
11
15
|
branch_to_version_re:
|
@@ -15,9 +19,7 @@ version:
|
|
15
19
|
to: \1
|
16
20
|
|
17
21
|
publish:
|
22
|
+
pypi: false
|
18
23
|
docker:
|
19
24
|
images:
|
20
|
-
-
|
21
|
-
name: camptocamp/{{package}}-geoportal
|
22
|
-
- group: config
|
23
|
-
name: camptocamp/{{package}}-config
|
25
|
+
- name: camptocamp/{{cookiecutter.package}}-config
|
@@ -0,0 +1 @@
|
|
1
|
+
c2cciutils==1.1.*
|
@@ -1,9 +1,17 @@
|
|
1
1
|
---
|
2
|
-
version: '2.
|
2
|
+
version: '2.3'
|
3
3
|
|
4
4
|
services:
|
5
5
|
config:
|
6
6
|
image: ${DOCKER_BASE}-config:${DOCKER_TAG}
|
7
|
+
build:
|
8
|
+
context: .
|
9
|
+
args:
|
10
|
+
SIMPLE: ${SIMPLE}
|
11
|
+
PGSCHEMA: ${PGSCHEMA}
|
12
|
+
GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
|
13
|
+
GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
|
14
|
+
GEOMAPFISH_MAIN_MINOR_VERSION: ${GEOMAPFISH_MAIN_MINOR_VERSION}
|
7
15
|
user: www-data
|
8
16
|
environment:
|
9
17
|
- VISIBLE_WEB_HOST
|
@@ -18,9 +26,13 @@ services:
|
|
18
26
|
- PGDATABASE
|
19
27
|
- PGSSLMODE
|
20
28
|
- PGSCHEMA_STATIC
|
29
|
+
- SRID
|
21
30
|
- SQLALCHEMY_POOL_RECYCLE
|
22
31
|
- SQLALCHEMY_POOL_SIZE
|
23
32
|
- SQLALCHEMY_MAX_OVERFLOW
|
33
|
+
- SQLALCHEMY_SLAVE_POOL_RECYCLE
|
34
|
+
- SQLALCHEMY_SLAVE_POOL_SIZE
|
35
|
+
- SQLALCHEMY_SLAVE_MAX_OVERFLOW
|
24
36
|
- GEOPORTAL_INTERNAL_URL
|
25
37
|
- GEOPORTAL_INTERNAL_HOST
|
26
38
|
- GEOPORTAL_INTERNAL_PORT
|
@@ -30,7 +42,10 @@ services:
|
|
30
42
|
- MUTUALIZED_PRINT_URL
|
31
43
|
- DISABLE_MUTUALIZED_PRINT
|
32
44
|
- DISABLE_LOCAL_PRINT
|
45
|
+
- DISABLE_MUTUALIZE
|
46
|
+
- DISABLE_LOCAL
|
33
47
|
- MAPSERVER_URL
|
48
|
+
- QGISSERVER_URL
|
34
49
|
- REDIS_HOST
|
35
50
|
- REDIS_PORT
|
36
51
|
- REDIS_DB
|
@@ -42,9 +57,16 @@ services:
|
|
42
57
|
- AWS_SECRET_ACCESS_KEY
|
43
58
|
- AWS_DEFAULT_REGION
|
44
59
|
- AWS_S3_ENDPOINT
|
60
|
+
- AZURE_STORAGE_CONNECTION_STRING
|
61
|
+
- AZURE_STORAGE_ACCOUNT
|
62
|
+
- AZURE_STORAGE_ACCESS_TOKEN
|
63
|
+
- AZURE_STORAGE_ACCESS_KEY
|
64
|
+
- AZURE_STORAGE_SAS_TOKEN
|
65
|
+
- TILEGENERATION_AZURE_CONTAINER
|
66
|
+
- RASTER_BASE_PATH
|
45
67
|
|
46
68
|
print:
|
47
|
-
image: camptocamp/mapfish_print:3.
|
69
|
+
image: camptocamp/mapfish_print:3.28
|
48
70
|
user: www-data
|
49
71
|
restart: unless-stopped
|
50
72
|
environment:
|
@@ -52,7 +74,7 @@ services:
|
|
52
74
|
- PGOPTIONS
|
53
75
|
|
54
76
|
mapserver:
|
55
|
-
image: camptocamp/mapserver:7.6
|
77
|
+
image: camptocamp/mapserver:7.6-gdal3.7
|
56
78
|
user: www-data
|
57
79
|
restart: unless-stopped
|
58
80
|
entrypoint: []
|
@@ -75,16 +97,39 @@ services:
|
|
75
97
|
- AWS_SECRET_ACCESS_KEY
|
76
98
|
- AWS_DEFAULT_REGION
|
77
99
|
- AWS_S3_ENDPOINT
|
100
|
+
- AZURE_STORAGE_CONNECTION_STRING
|
101
|
+
- AZURE_STORAGE_ACCOUNT
|
102
|
+
- AZURE_STORAGE_ACCESS_TOKEN
|
103
|
+
- AZURE_STORAGE_ACCESS_KEY
|
104
|
+
- AZURE_STORAGE_SAS_TOKEN
|
78
105
|
- CPL_VSIL_CURL_USE_CACHE
|
79
106
|
- CPL_VSIL_CURL_CACHE_SIZE
|
80
107
|
- CPL_VSIL_CURL_USE_HEAD
|
81
108
|
- GDAL_DISABLE_READDIR_ON_OPEN
|
82
109
|
- QGIS_SERVER_LOG_LEVEL=2
|
110
|
+
- QGIS_AUTH_DB_DIR_PATH
|
111
|
+
- QGIS_SERVER_IGNORE_BAD_LAYERS
|
112
|
+
- QGIS_SERVER_DISABLE_GETPRINT
|
113
|
+
- PGSERVICEFILE
|
83
114
|
- LOG_LEVEL=INFO
|
84
115
|
- LOG_TYPE
|
85
116
|
- C2CGEOPORTAL_LOG_LEVEL
|
86
117
|
- SQL_LOG_LEVEL
|
87
118
|
- OTHER_LOG_LEVEL
|
119
|
+
- GEOMAPFISH_ACCESSCONTROL_BASE_URL=${QGISSERVER_URL}
|
120
|
+
- QGIS_SERVER_TRUST_LAYER_METADATA=TRUE
|
121
|
+
- QGIS_SERVER_PARALLEL_RENDERING=FALSE
|
122
|
+
- MAX_CACHE_LAYERS=100
|
123
|
+
- QGIS_SERVER_IGNORE_BAD_LAYERS=TRUE
|
124
|
+
- QGIS_SERVER_CACHE_SIZE=60 # MB
|
125
|
+
- QGIS_SERVER_WMS_MAX_HEIGHT=5000
|
126
|
+
- QGIS_SERVER_WMS_MAX_WIDTH=5000
|
127
|
+
- QGIS_SERVER_API_WFS3_MAX_LIMIT=10000
|
128
|
+
- QGIS_SERVER_DISABLE_GETPRINT=TRUE
|
129
|
+
- QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES=/etc/qgisserver/
|
130
|
+
- QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE=fr
|
131
|
+
- QGIS_AUTH_DB_DIR_PATH=/etc/qgisserver/
|
132
|
+
- PGSERVICEFILE=/etc/qgisserver/pg_service.conf
|
88
133
|
|
89
134
|
tinyows:
|
90
135
|
image: camptocamp/tinyows:master
|
@@ -92,7 +137,7 @@ services:
|
|
92
137
|
restart: unless-stopped
|
93
138
|
|
94
139
|
redis:
|
95
|
-
image: redis:6
|
140
|
+
image: &redis-image redis:6
|
96
141
|
user: www-data
|
97
142
|
restart: unless-stopped
|
98
143
|
command:
|
@@ -109,10 +154,10 @@ services:
|
|
109
154
|
- '30'
|
110
155
|
|
111
156
|
redis_master:
|
112
|
-
image: redis
|
157
|
+
image: *redis-image
|
113
158
|
|
114
159
|
redis_slave:
|
115
|
-
image: redis
|
160
|
+
image: *redis-image
|
116
161
|
command: redis-server --slaveof redis_master 6379
|
117
162
|
|
118
163
|
redis_sentinel:
|
@@ -123,16 +168,21 @@ services:
|
|
123
168
|
- MASTER=redis_master
|
124
169
|
|
125
170
|
tilecloudchain:
|
126
|
-
image: camptocamp/tilecloud-chain:1.
|
171
|
+
image: &tilecloudchain-image camptocamp/tilecloud-chain:1.17
|
127
172
|
user: www-data
|
128
173
|
restart: unless-stopped
|
129
174
|
environment:
|
130
175
|
- DEVELOPMENT
|
131
|
-
- GUNICORN_PARAMS
|
132
176
|
- VISIBLE_ENTRY_POINT
|
133
177
|
- TILEGENERATION_CONFIGFILE=/etc/tilegeneration/config.yaml
|
134
178
|
- AWS_ACCESS_KEY_ID
|
135
179
|
- AWS_SECRET_ACCESS_KEY
|
180
|
+
- AZURE_STORAGE_CONNECTION_STRING
|
181
|
+
- AZURE_STORAGE_ACCOUNT
|
182
|
+
- AZURE_STORAGE_ACCESS_TOKEN
|
183
|
+
- AZURE_STORAGE_ACCESS_KEY
|
184
|
+
- AZURE_STORAGE_SAS_TOKEN
|
185
|
+
- AZURE_STORAGE_ACCOUNT_URL
|
136
186
|
- C2C_BASE_PATH
|
137
187
|
- C2C_REDIS_URL
|
138
188
|
- C2C_REDIS_SENTINELS
|
@@ -155,7 +205,7 @@ services:
|
|
155
205
|
- LOG_TYPE
|
156
206
|
|
157
207
|
tilegeneration_slave:
|
158
|
-
image:
|
208
|
+
image: *tilecloudchain-image
|
159
209
|
user: www-data
|
160
210
|
restart: unless-stopped
|
161
211
|
entrypoint:
|
@@ -165,12 +215,18 @@ services:
|
|
165
215
|
environment:
|
166
216
|
- AWS_ACCESS_KEY_ID
|
167
217
|
- AWS_SECRET_ACCESS_KEY
|
218
|
+
- AZURE_STORAGE_CONNECTION_STRING
|
219
|
+
- AZURE_STORAGE_ACCOUNT
|
220
|
+
- AZURE_STORAGE_ACCESS_TOKEN
|
221
|
+
- AZURE_STORAGE_ACCESS_KEY
|
222
|
+
- AZURE_STORAGE_SAS_TOKEN
|
223
|
+
- AZURE_STORAGE_ACCOUNT_URL
|
168
224
|
|
169
225
|
geoportal:
|
170
|
-
image:
|
226
|
+
image: camptocamp/geomapfishapp-geoportal:${GEOMAPFISH_MAIN_MINOR_VERSION}
|
171
227
|
user: www-data
|
172
228
|
restart: unless-stopped
|
173
|
-
environment:
|
229
|
+
environment: &geoportal-env
|
174
230
|
- DEVELOPMENT
|
175
231
|
- VISIBLE_ENTRY_POINT
|
176
232
|
- PACKAGE
|
@@ -182,16 +238,24 @@ services:
|
|
182
238
|
- PGPASSWORD
|
183
239
|
- PGDATABASE
|
184
240
|
- PGSSLMODE
|
241
|
+
- PGSCHEMA
|
185
242
|
- PGSCHEMA_STATIC
|
186
243
|
- PGOPTIONS
|
187
244
|
- SQLALCHEMY_POOL_RECYCLE
|
188
245
|
- SQLALCHEMY_POOL_SIZE
|
189
246
|
- SQLALCHEMY_MAX_OVERFLOW
|
247
|
+
- SQLALCHEMY_SLAVE_POOL_RECYCLE
|
248
|
+
- SQLALCHEMY_SLAVE_POOL_SIZE
|
249
|
+
- SQLALCHEMY_SLAVE_MAX_OVERFLOW
|
190
250
|
- AWS_ACCESS_KEY_ID
|
191
251
|
- AWS_SECRET_ACCESS_KEY
|
192
252
|
- AWS_DEFAULT_REGION
|
193
253
|
- AWS_S3_ENDPOINT
|
194
|
-
-
|
254
|
+
- AZURE_STORAGE_CONNECTION_STRING
|
255
|
+
- AZURE_STORAGE_ACCOUNT
|
256
|
+
- AZURE_STORAGE_ACCESS_TOKEN
|
257
|
+
- AZURE_STORAGE_ACCESS_KEY
|
258
|
+
- AZURE_STORAGE_SAS_TOKEN
|
195
259
|
- VISIBLE_WEB_HOST
|
196
260
|
- VISIBLE_WEB_PROTOCOL
|
197
261
|
- AUTHTKT_TIMEOUT
|
@@ -233,11 +297,29 @@ services:
|
|
233
297
|
- GUNICORN_LOG_LEVEL
|
234
298
|
- OTHER_LOG_LEVEL
|
235
299
|
- DOGPILECACHE_LOG_LEVEL
|
300
|
+
- C2CWSGIUTILS_LOG_LEVEL
|
236
301
|
- LOG_TYPE
|
302
|
+
- C2CGEOPORTAL_THEME_TIMEOUT=300
|
303
|
+
|
304
|
+
geoportal-advance:
|
305
|
+
image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
|
306
|
+
build: &geoportal-build
|
307
|
+
context: geoportal
|
308
|
+
args:
|
309
|
+
GIT_HASH: ${GIT_HASH}
|
310
|
+
PGSCHEMA: ${PGSCHEMA}
|
311
|
+
GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
|
312
|
+
GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
|
313
|
+
GEOMAPFISH_MAIN_MINOR_VERSION: ${GEOMAPFISH_MAIN_MINOR_VERSION}
|
314
|
+
user: www-data
|
315
|
+
restart: unless-stopped
|
316
|
+
environment: *geoportal-env
|
237
317
|
|
238
318
|
tools:
|
239
319
|
image: camptocamp/geomapfish-tools:${GEOMAPFISH_VERSION}
|
240
320
|
restart: unless-stopped
|
321
|
+
volumes:
|
322
|
+
- .:/src
|
241
323
|
environment:
|
242
324
|
- PGSCHEMA
|
243
325
|
# From geoportal
|
@@ -258,7 +340,11 @@ services:
|
|
258
340
|
- AWS_SECRET_ACCESS_KEY
|
259
341
|
- AWS_DEFAULT_REGION
|
260
342
|
- AWS_S3_ENDPOINT
|
261
|
-
-
|
343
|
+
- AZURE_STORAGE_CONNECTION_STRING
|
344
|
+
- AZURE_STORAGE_ACCOUNT
|
345
|
+
- AZURE_STORAGE_ACCESS_TOKEN
|
346
|
+
- AZURE_STORAGE_ACCESS_KEY
|
347
|
+
- AZURE_STORAGE_SAS_TOKEN
|
262
348
|
- VISIBLE_WEB_HOST
|
263
349
|
- VISIBLE_WEB_PROTOCOL
|
264
350
|
- AUTHTKT_TIMEOUT
|
@@ -300,10 +386,12 @@ services:
|
|
300
386
|
- GUNICORN_LOG_LEVEL
|
301
387
|
- OTHER_LOG_LEVEL
|
302
388
|
- DOGPILECACHE_LOG_LEVEL
|
389
|
+
- C2CWSGIUTILS_LOG_LEVEL
|
303
390
|
- LOG_TYPE
|
391
|
+
- SUFFIX=
|
304
392
|
|
305
|
-
alembic:
|
306
|
-
image:
|
393
|
+
alembic: &alembic
|
394
|
+
image: camptocamp/geomapfishapp-geoportal:${GEOMAPFISH_MAIN_VERSION}
|
307
395
|
user: www-data
|
308
396
|
entrypoint: []
|
309
397
|
command:
|
@@ -320,14 +408,20 @@ services:
|
|
320
408
|
- PGPASSWORD
|
321
409
|
- PGDATABASE
|
322
410
|
- PGSSLMODE
|
411
|
+
- PGSCHEMA
|
323
412
|
- PGSCHEMA_STATIC
|
324
413
|
- LOG_TYPE
|
325
414
|
|
415
|
+
alembic-advance:
|
416
|
+
<<: *alembic
|
417
|
+
image: ${DOCKER_BASE}-geoportal:${DOCKER_TAG}
|
418
|
+
build: *geoportal-build
|
419
|
+
|
326
420
|
front:
|
327
|
-
image: haproxy:2.
|
421
|
+
image: haproxy:2.3
|
328
422
|
restart: unless-stopped
|
329
423
|
volumes:
|
330
|
-
-
|
424
|
+
- ${FRONT_LOG_DIRECTORY}:/dev/log:rw
|
331
425
|
command:
|
332
426
|
- haproxy
|
333
427
|
- -f
|
@@ -337,6 +431,13 @@ services:
|
|
337
431
|
|
338
432
|
webpack_dev_server:
|
339
433
|
image: ${DOCKER_BASE}-geoportal-dev:${DOCKER_TAG}
|
434
|
+
build:
|
435
|
+
context: geoportal
|
436
|
+
target: builder
|
437
|
+
args:
|
438
|
+
GEOMAPFISH_VERSION: ${GEOMAPFISH_VERSION}
|
439
|
+
GEOMAPFISH_MAIN_VERSION: ${GEOMAPFISH_MAIN_VERSION}
|
440
|
+
GEOMAPFISH_MAIN_MINOR_VERSION: ${GEOMAPFISH_MAIN_MINOR_VERSION}
|
340
441
|
volumes:
|
341
442
|
- ./geoportal/${PACKAGE}_geoportal/static-ngeo:/app/${PACKAGE}_geoportal/static-ngeo
|
342
443
|
environment:
|
@@ -356,3 +457,18 @@ services:
|
|
356
457
|
- AWS_SECRET_ACCESS_KEY
|
357
458
|
- AWS_DEFAULT_REGION
|
358
459
|
- AWS_S3_ENDPOINT
|
460
|
+
- AZURE_STORAGE_CONNECTION_STRING
|
461
|
+
- AZURE_STORAGE_ACCOUNT
|
462
|
+
- AZURE_STORAGE_ACCESS_TOKEN
|
463
|
+
- AZURE_STORAGE_ACCESS_KEY
|
464
|
+
- AZURE_STORAGE_SAS_TOKEN
|
465
|
+
|
466
|
+
db:
|
467
|
+
image: camptocamp/postgres:${POSTGRES_TAG}
|
468
|
+
environment:
|
469
|
+
- PGUSER
|
470
|
+
- PGPASSWORD
|
471
|
+
- PGDATABASE
|
472
|
+
- POSTGRES_PASSWORD=${PGPASSWORD}
|
473
|
+
- POSTGRES_DB=${PGDATABASE}
|
474
|
+
- POSTGRES_USER=${PGUSER}
|
c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml
ADDED
@@ -0,0 +1,66 @@
|
|
1
|
+
---
|
2
|
+
# This file can be renamed as `docker-compose.override.yaml` and uncomment the desired lines for
|
3
|
+
# development. The file `docker-compose.override.yaml` is ignored by Git by default.
|
4
|
+
|
5
|
+
version: '2.3'
|
6
|
+
|
7
|
+
services:
|
8
|
+
geoportal:
|
9
|
+
user: root
|
10
|
+
# volumes:
|
11
|
+
# For Python project development.
|
12
|
+
# - ./geoportal/${PACKAGE}_geoportal:/app/${PACKAGE}_geoportal
|
13
|
+
# For Python c2cgeportal development.
|
14
|
+
# - ./../c2cgeoportal/commons/c2cgeoportal_commons:/opt/c2cgeoportal/commons/c2cgeoportal_commons
|
15
|
+
# - ./../c2cgeoportal/geoportal/c2cgeoportal_geoportal:/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal
|
16
|
+
# - ./../c2cgeoportal/admin/c2cgeoportal_admin:/opt/c2cgeoportal/admin/c2cgeoportal_admin
|
17
|
+
command:
|
18
|
+
- /usr/local/bin/pserve
|
19
|
+
- --reload
|
20
|
+
- c2c:///app/development.ini
|
21
|
+
environment:
|
22
|
+
- DEVELOPMENT=1
|
23
|
+
- C2C_SQL_PROFILER_ENABLED=1
|
24
|
+
- C2C_DEBUG_VIEW_ENABLED=1
|
25
|
+
# - PRINT_URL=http://print:8080/print/
|
26
|
+
- PYTHONWARNINGS=default::DeprecationWarning
|
27
|
+
- SQLALCHEMY_WARN_20=true
|
28
|
+
ports:
|
29
|
+
- 5678:5678 # For remote debugging using Visual Studio Code
|
30
|
+
|
31
|
+
# Also uncomment the PRINT_URL in geoportal
|
32
|
+
# print:
|
33
|
+
# extends:
|
34
|
+
# file: docker-compose-lib.yaml
|
35
|
+
# service: print
|
36
|
+
# volumes_from:
|
37
|
+
# - config:ro
|
38
|
+
# environment:
|
39
|
+
# - LOG_LEVEL=DEBUG
|
40
|
+
|
41
|
+
# qgisserver:
|
42
|
+
# # volumes:
|
43
|
+
# # - './../c2cgeoportal/docker/qgisserver/geomapfish_qgisserver/:/var/www/plugins/geomapfish_qgisserver/'
|
44
|
+
# # - './../c2cgeoportal/commons/c2cgeoportal_commons:/opt/c2cgeoportal/commons/c2cgeoportal_commons/'
|
45
|
+
# environment:
|
46
|
+
# - QGIS_SERVER_LOG_LEVEL=0
|
47
|
+
# - QGIS_CATCH_SEGV=1 # The result stack traces will be available in /var/log/qgis.log
|
48
|
+
|
49
|
+
tools:
|
50
|
+
volumes_from:
|
51
|
+
- config:rw
|
52
|
+
#
|
53
|
+
# For Javascript project development.
|
54
|
+
# The debug application will be available at ``https://<host>/<entry_point>/dev/<interface>.html``.
|
55
|
+
# webpack_dev_server:
|
56
|
+
# # Uncomment these lines when you want to debug respectively the project js, ngeo js and/or the gmf contrib js.
|
57
|
+
# # Adapt the path for ngeo / gmf contrib to point where you have checkouted the code.
|
58
|
+
# # volumes:
|
59
|
+
# # - ./geoportal/${PACKAGE}_geoportal/static-ngeo:/app/${PACKAGE}_geoportal/static-ngeo
|
60
|
+
# # - ./../ngeo/src:/usr/lib/node_modules/ngeo/src
|
61
|
+
# # - ./../ngeo/contribs:/usr/lib/node_modules/ngeo/contribs
|
62
|
+
# volumes_from:
|
63
|
+
# - config:rw
|
64
|
+
# extends:
|
65
|
+
# file: docker-compose-lib.yaml
|
66
|
+
# service: webpack_dev_server
|
@@ -1,7 +1,10 @@
|
|
1
1
|
---
|
2
2
|
# The project Docker compose file for development.
|
3
3
|
|
4
|
-
version: '2.
|
4
|
+
version: '2.3'
|
5
|
+
|
6
|
+
volumes:
|
7
|
+
postgresql_data:
|
5
8
|
|
6
9
|
services:
|
7
10
|
config:
|
@@ -32,12 +35,9 @@ services:
|
|
32
35
|
## volumes_from:
|
33
36
|
## - config:ro
|
34
37
|
## environment:
|
35
|
-
##
|
36
|
-
##
|
37
|
-
## -
|
38
|
-
## # Multiple QGIS project files
|
39
|
-
## - QGIS_PROJECT_FILE=
|
40
|
-
## - GEOMAPFISH_ACCESSCONTROL_CONFIG=/etc/qgisserver/accesscontrol_config.yaml
|
38
|
+
## - QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES=/etc/qgisserver/
|
39
|
+
## # Or
|
40
|
+
## - QGIS_SERVER_LANDING_PAGE_PROJECTS_PG_CONNECTIONS=...
|
41
41
|
|
42
42
|
tinyows:
|
43
43
|
extends:
|
@@ -52,7 +52,7 @@ services:
|
|
52
52
|
file: docker-compose-lib.yaml
|
53
53
|
service: redis
|
54
54
|
|
55
|
-
# To test
|
55
|
+
# To test Kubernetes version
|
56
56
|
# redis_master:
|
57
57
|
# extends:
|
58
58
|
# file: docker-compose-lib.yaml
|
@@ -109,10 +109,15 @@ services:
|
|
109
109
|
|
110
110
|
# Rich image for project development with e.-g. vim, tree, awscli, psql, ...
|
111
111
|
tools:
|
112
|
-
volumes_from:
|
113
|
-
- config:rw
|
114
|
-
volumes:
|
115
|
-
- .:/src
|
116
112
|
extends:
|
117
113
|
file: docker-compose-lib.yaml
|
118
114
|
service: tools
|
115
|
+
volumes_from:
|
116
|
+
- config:ro
|
117
|
+
|
118
|
+
# db:
|
119
|
+
# extends:
|
120
|
+
# file: docker-compose-lib.yaml
|
121
|
+
# service: db
|
122
|
+
# volumes:
|
123
|
+
# - postgresql_data:/var/lib/postgresql/data
|
c2cgeoportal_geoportal/scaffolds/create/{env.default_tmpl → {{cookiecutter.project}}/env.default}
RENAMED
@@ -1,10 +1,12 @@
|
|
1
1
|
# Default values for c2cgeoportal
|
2
|
-
GEOMAPFISH_VERSION={{geomapfish_version}}
|
3
|
-
GEOMAPFISH_MAIN_VERSION={{geomapfish_main_version}}
|
4
|
-
|
5
|
-
|
2
|
+
GEOMAPFISH_VERSION={{cookiecutter.geomapfish_version}}
|
3
|
+
GEOMAPFISH_MAIN_VERSION={{cookiecutter.geomapfish_main_version}}
|
4
|
+
GEOMAPFISH_MAIN_MINOR_VERSION={{cookiecutter.geomapfish_main_minor_version}}
|
5
|
+
COMPOSE_PROJECT_NAME={{cookiecutter.package}}
|
6
|
+
PACKAGE={{cookiecutter.package}}
|
7
|
+
SRID={{cookiecutter.srid}}
|
6
8
|
DOCKER_PORT=8484
|
7
|
-
DOCKER_BASE=camptocamp/{{package}}
|
9
|
+
DOCKER_BASE=camptocamp/{{cookiecutter.package}}
|
8
10
|
DOCKER_TAG=latest
|
9
11
|
VISIBLE_WEB_HOST=localhost:8484
|
10
12
|
VISIBLE_WEB_PROTOCOL=https
|
@@ -13,18 +15,22 @@ DEVELOPMENT=False
|
|
13
15
|
AUTHTKT_TIMEOUT=86400
|
14
16
|
AUTHTKT_REISSUE_TIME=9000
|
15
17
|
AUTHTKT_MAXAGE=86400
|
16
|
-
AUTHTKT_SECRET={{authtkt_secret}}
|
17
|
-
AUTHTKT_COOKIENAME=auth_tkt_{{package}}
|
18
|
+
AUTHTKT_SECRET={{cookiecutter.authtkt_secret}}
|
19
|
+
AUTHTKT_COOKIENAME=auth_tkt_{{cookiecutter.package}}
|
18
20
|
AUTHTKT_HTTP_ONLY=True
|
19
21
|
AUTHTKT_SECURE=True
|
20
22
|
AUTHTKT_SAMESITE=Lax
|
21
23
|
BASICAUTH=False
|
22
24
|
MUTUALIZED_PRINT_URL=mutualized-print.apps.openshift-ch-1.camptocamp.com
|
23
25
|
# For internal print
|
24
|
-
#
|
25
|
-
#
|
26
|
+
# DISABLE_LOCAL will be set to # on mutualize services to comment local configuration
|
27
|
+
# DISABLE_MUTUALIZE is set to # locally to comment mutualize services
|
28
|
+
DISABLE_MUTUALIZE=#
|
29
|
+
DISABLE_LOCAL=
|
30
|
+
# For backward compatibility
|
26
31
|
DISABLE_MUTUALIZED_PRINT=#
|
27
32
|
DISABLE_LOCAL_PRINT=
|
33
|
+
|
28
34
|
GEOPORTAL_INTERNAL_URL=http://geoportal:8080
|
29
35
|
GEOPORTAL_INTERNAL_HOST=geoportal
|
30
36
|
GEOPORTAL_INTERNAL_PORT=8080
|
@@ -34,21 +40,24 @@ TILECLOUDCHAIN_INTERNAL_PORT=8080
|
|
34
40
|
# For internal print
|
35
41
|
MAPSERVER_URL=http://mapserver:8080/
|
36
42
|
TINYOWS_URL=http://tinyows:8080/
|
37
|
-
QGISSERVER_URL=http://qgisserver:8080/
|
38
|
-
QGIS_VERSION=3.
|
39
|
-
|
43
|
+
QGISSERVER_URL=http://qgisserver:8080/mapserv_proxy
|
44
|
+
QGIS_VERSION=3.28-gdal3.7
|
45
|
+
POSTGRES_TAG=13-postgis-3
|
40
46
|
|
41
47
|
DEVSERVER_HOST=webpack_dev_server:8080
|
42
48
|
REDIS_SERVICENAME=mymaster
|
43
49
|
REDIS_DB=0
|
44
|
-
REDIS_TIMEOUT=
|
45
|
-
C2C_REDIS_TIMEOUT=
|
50
|
+
REDIS_TIMEOUT=10
|
51
|
+
C2C_REDIS_TIMEOUT=10
|
46
52
|
C2C_REDIS_SERVICENAME=mymaster
|
47
53
|
C2C_REDIS_DB=0
|
48
54
|
PGOPTIONS=-c statement_timeout=30000
|
49
55
|
SQLALCHEMY_POOL_RECYCLE=30
|
50
56
|
SQLALCHEMY_POOL_SIZE=5
|
51
57
|
SQLALCHEMY_MAX_OVERFLOW=25
|
58
|
+
SQLALCHEMY_SLAVE_POOL_RECYCLE=30
|
59
|
+
SQLALCHEMY_SLAVE_POOL_SIZE=5
|
60
|
+
SQLALCHEMY_SLAVE_MAX_OVERFLOW=25
|
52
61
|
CATALINA_OPTS=-Xmx1024m
|
53
62
|
C2C_BROADCAST_PREFIX=broadcast_geoportal_
|
54
63
|
LOG_LEVEL=INFO
|
@@ -60,8 +69,14 @@ DOGPILECACHE_LOG_LEVEL=WARN
|
|
60
69
|
C2CWSGI_LOG_LEVEL=WARN
|
61
70
|
TILECLOUD_LOG_LEVEL=INFO
|
62
71
|
TILECLOUD_CHAIN_LOG_LEVEL=INFO
|
72
|
+
C2CWSGIUTILS_LOG_LEVEL=INFO
|
63
73
|
LOG_TYPE=console
|
64
74
|
CPL_VSIL_CURL_USE_CACHE=TRUE
|
65
75
|
CPL_VSIL_CURL_CACHE_SIZE=128000000
|
66
76
|
CPL_VSIL_CURL_USE_HEAD=FALSE
|
67
77
|
GDAL_DISABLE_READDIR_ON_OPEN=TRUE
|
78
|
+
QGIS_AUTH_DB_DIR_PATH=/etc/qgisserver/
|
79
|
+
QGIS_SERVER_IGNORE_BAD_LAYERS=true
|
80
|
+
QGIS_SERVER_DISABLE_GETPRINT=true
|
81
|
+
PGSERVICEFILE=/etc/qgisserver/pg_service.conf
|
82
|
+
FRONT_LOG_DIRECTORY=/dev/log
|
c2cgeoportal_geoportal/scaffolds/create/{env.project_tmpl → {{cookiecutter.project}}/env.project}
RENAMED
@@ -1,7 +1,7 @@
|
|
1
1
|
# Custom project values
|
2
2
|
|
3
3
|
# Database
|
4
|
-
PGDATABASE=gmf_{{package}}
|
4
|
+
PGDATABASE=gmf_{{cookiecutter.package}}
|
5
5
|
PGSCHEMA=main
|
6
6
|
PGSCHEMA_STATIC=main_static
|
7
7
|
# To use the mutualised database.
|
@@ -21,13 +21,24 @@ PGSSLMODE=require
|
|
21
21
|
# PGPASSWORD=www-data
|
22
22
|
# PGSSLMODE=prefer
|
23
23
|
|
24
|
-
#
|
25
|
-
|
24
|
+
# For Exoscale S3
|
25
|
+
AWS_DEFAULT_REGION=ch-dk-2
|
26
|
+
AWS_S3_ENDPOINT=sos-ch-dk-2.exo.io
|
27
|
+
|
28
|
+
# Set the raster Base path
|
29
|
+
# Amazon S3
|
30
|
+
# RASTER_BASE_PATH=/vsis3/<bucket>/
|
31
|
+
# Azure Blob Storage
|
32
|
+
# RASTER_BASE_PATH=/vsiaz/<container>/
|
33
|
+
|
34
|
+
# Use the mutualize print, ask Camptocamp to configure your project.
|
35
|
+
# PRINT_URL=https://mutualized-print.apps.openshift-ch-1.camptocamp.com/print/{{cookiecutter.package}}/
|
26
36
|
# To use the internal print:
|
27
37
|
PRINT_URL=http://print:8080/print/
|
28
38
|
|
29
39
|
TILEGENERATION_SQS_QUEUE=<queue_name>
|
30
40
|
TILEGENERATION_S3_BUCKET=<bucket_name>
|
41
|
+
TILEGENERATION_AZURE_CONTAINER=<container_name>
|
31
42
|
|
32
43
|
# For production
|
33
44
|
# FRONT_INNER_PORT=80
|
@@ -45,4 +56,5 @@ REDIS_HOST=redis
|
|
45
56
|
REDIS_PORT=6379
|
46
57
|
C2C_REDIS_URL=redis://redis:6379/0
|
47
58
|
|
48
|
-
|
59
|
+
# Set a strong password here for authentication on technical interfaces behind path /c2c
|
60
|
+
C2C_SECRET=
|