Merge branch 'master' into 3.0

camptocamp · Jul 5, 2018 · 0547b00 · 0547b00
2 parents 084361c + c722f3e
commit 0547b00
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/acceptance_tests/config/Dockerfile b/acceptance_tests/config/Dockerfile
@@ -1,7 +1,7 @@
 FROM tianon/true
 
-COPY project /project
+COPY project /etc/qgisserver
 COPY db /docker-entrypoint-initdb.d
 
-VOLUME /project
+VOLUME /etc/qgisserver
 VOLUME /docker-entrypoint-initdb.d
diff --git a/acceptance_tests/docker-compose.yml b/acceptance_tests/docker-compose.yml
@@ -6,9 +6,10 @@ mapserver:
   links:
     - db
   ports:
-    - 8380:80
+    - 8380:8080
   volumes_from:
     - acceptance_config
+  user: www-data
 
 db:
   image: camptocamp/postgresql:pg9.5-latest

diff --git a/server/runtime/etc/apache2/conf-enabled/qgis.conf b/server/runtime/etc/apache2/conf-enabled/qgis.conf
@@ -8,3 +8,5 @@ ScriptAliasMatch "^/.*" /usr/local/bin/qgis-mapserv-wrapper
     Include /tmp/pass-env
     Header set Access-Control-Allow-Origin "*"
 </LocationMatch>
+
+ServerName localhost
diff --git a/server/runtime/usr/local/bin/start-server b/server/runtime/usr/local/bin/start-server
@@ -13,7 +13,7 @@ then
     echo "Switching listen port to 8080"
     cd /tmp
     sed -i -e 's/<VirtualHost \*:80>/<VirtualHost *:8080>/' /etc/apache2/sites-available/000-default.conf
-    sed -i -e 's/Listen 80/Listen 8080/' /etc/apache2/ports.conf
+    sed -i -e 's/Listen 80$/Listen 8080/' /etc/apache2/ports.conf
 fi
 
 trap 'echo "caught a SIGTERM"; kill -TERM $PID2; wait $PID2; kill -TERM $PID1; wait $PID1' TERM
@@ -31,3 +31,4 @@ PID1=$!
 apache2 -DFOREGROUND &
 PID2=$!
 wait $PID2
+kill $PID1 2>/dev/null