From f5bdccf9e142a8b86b682f9a0f47c7394cf0487e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 17 Jul 2019 17:07:49 +0200 Subject: [PATCH 1/2] Litle doc fix --- doc/integrator/upgrade_application.rst.mako | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/integrator/upgrade_application.rst.mako b/doc/integrator/upgrade_application.rst.mako index 89decb2bb6..bfaf09bc60 100644 --- a/doc/integrator/upgrade_application.rst.mako +++ b/doc/integrator/upgrade_application.rst.mako @@ -128,7 +128,7 @@ Add ``UPGRADE_ARGS += --force-docker --new-makefile=Makefile`` in your ``. git add .mk git commit --message="Start upgrade" - ./docker-run --home make --makefile=temp.mk upgrade + ./docker-run --home make --makefile=.mk upgrade Then follow the instructions. @@ -137,7 +137,7 @@ Remove the ``UPGRADE_ARGS`` in your ``.mk`` file. .. prompt:: bash git add .mk - git commit --quiet --message="Finish upgrade" + git commit --message="Finish upgrade" Convert a version 2.3 to non-Docker From 99c877deff1433a18c122bca6295aac9e38dc639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 17 Jul 2019 17:08:08 +0200 Subject: [PATCH 2/2] Add an update path --- geoportal/c2cgeoportal_geoportal/scaffolds/create/vars.yaml_tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/vars.yaml_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/vars.yaml_tmpl index fa5ade95b1..9ce64d35f6 100644 --- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/vars.yaml_tmpl +++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/vars.yaml_tmpl @@ -238,6 +238,7 @@ update_paths: - resourceproxy - servers - shortener + - shortener.allowed_hosts - sqlalchemy - sqlalchemy_slave - tinyowsproxy