Don't have tow times the MAPSERVER_URL

camptocamp · May 20, 2019 · eef4f04 · eef4f04
1 parent e7d03e4
commit eef4f04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/+dot+env.mako_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/+dot+env.mako_tmpl
@@ -21,15 +21,14 @@ GEOPORTAL_INTERNAL_URL=http://geoportal:8080
 TILECLOUDCHAIN_INTERNAL_URL=http://tilecloudchain:8080
 MAPCACHE_URL=http://mapcache:8080/mapcache/
 MAPSERVER_URL=http://mapserver:8080/
+TINYOWS_URL=http://tinyows:8080/
 QGISSERVER_URL=http://qgisserver:8080/
 MEMCACHED_HOST=memcached
 MEMCACHED_PORT=11211
 REDIS_HOST=redis
 REDIS_PORT=6379
 TILEGENERATION_SQS_QUEUE=<queue_name>
 GUNICORN_PARAMS=--bind=:8080 --worker-class=gthread --threads=10 --workers=5 --timeout=60 --max-requests=1000 --max-requests-jitter=100
-TINYOWS_URL=http://tinyows:8080/
-MAPSERVER_URL=http://mapserver:8080/
 # Use the mutualised print, ask Camptocamp to configure your project.
 PRINT_URL=https://mutualized-print.paas-ch-3.camptocamp.com/print/${mutualized_print_app}/
 DEVSERVER_HOST=webpack_dev_server:8080

diff --git a/travis/test-upgrade-convert.sh b/travis/test-upgrade-convert.sh
@@ -332,7 +332,12 @@ function v240 {
     if [ -e .UPGRADE9 ]
     then
         git apply --3way ngeo.diff
-        ./docker-run --env=NODE_ENV make ${MAKE_ARGS} upgrade10
+        ./docker-run --env=NODE_ENV make upgrade10
+    fi
+    if [ -e .UPGRADE10 ]
+    then
+        git apply --3way create.diff
+        ./docker-run --env=NODE_ENV make upgrade11
     fi
     if [ ! -e .UPGRADE_SUCCESS ]
     then