Further refinements #420

Author: fernandinand

LICENSES/CLA-signed-list.md

@@ -19,3 +19,4 @@ C/ My company has custom contribution contract with Lutra Consulting Ltd. or I a
 * lavor, 26th April 2023
 * luxusko, 25th August 2023
 * jozef-budac, 30th January 2024
+* fernandinand, 9th April 2025

deployment/community/docker-compose.dev.yml

@@ -30,12 +30,12 @@ services:
     build:
       context: ../../web-app
       dockerfile: Dockerfile
-  #maildev:
-  #  image: maildev/maildev
-  #  container_name: merginmaps-maildev
-  #  restart: always
-  #  ports:
-  #    - 1080:1080
-  #    - 1025:1025
-  #  networks:
-  #    - merginmaps
+  maildev:
+    image: maildev/maildev
+    container_name: merginmaps-maildev
+    restart: always
+    ports:
+      - 1080:1080
+      - 1025:1025
+    networks:
+      - merginmaps

deployment/community/docker-compose.latest.yml

@@ -59,7 +59,7 @@ For more info check [documentation](https://merginmaps.com/docs/server/install/#
 
 Alternatively, you can run the following provisioning commands with some extra steps.
 
-### Before version 2025.2.0:
+### Prior to version 2025.2.0:
 ```
 sudo docker compose --env-file .prod.env -f docker-compose.yaml up
 sudo docker exec mergin-server-enterprise flask init-db
@@ -70,9 +70,13 @@ sudo docker exec mergin-server-enterprise flask user create <username> <password
 ## WebMaps
 
 If you want to deploy MerginMaps Webmaps infrastructure, please adjust `.prod.env` related environment variables and run:
+> [!NOTE]
+> Please remember the main Mergin Maps stack needs to be running already.
+> Otherwise, run it:
+> `docker compose --env-file .prod.env -f docker-compose.yaml up -d`
 
 ```
- sudo docker compose --env-file .prod.env -f docker-compose.maps.yaml up -d
+ sudo docker compose -f docker-compose.maps.yaml up -d
 ```
 
 ## Install and configure nginx for TLS termination

deployment/enterprise/README.md

@@ -25,8 +25,8 @@ services:
       - mergin-net
     depends_on:
       - qgis
-    #volumes:
-    #  - ./qgis_nginx_nginx-conf:/etc/nginx/conf.d/default.conf
+    volumes:
+      - ./qgis_nginx.conf:/etc/nginx/conf.d/default.conf
   qgis_extractor:
     container_name: mergin-qgis-extractor
     image: 433835555346.dkr.ecr.eu-west-1.amazonaws.com/mergin/qgis-extractor-ee:2025.1.0

deployment/enterprise/docker-compose.maps.yml

@@ -32,7 +32,7 @@ services:
       - mergin
 
   proxy:
-    image: nginxinc/nginx-unprivileged:1.25.5
+    image: nginxinc/nginx-unprivileged:1.27
     container_name: mergin-proxy-enterprise
     restart: always
     # run nginx as built-in user but with group mergin-family for files permissions

deployment/enterprise/docker-compose.yml

@@ -0,0 +1,16 @@
+server {
+  listen 80;
+  server_name _;
+
+  location / {
+    proxy_buffers 16 16k;
+    proxy_buffer_size 16k;
+    gzip off;
+    include fastcgi_params;
+    fastcgi_pass  qgis:5555;
+    # Wait up to 10 seconds for the qgis-server fastcgi application
+    # to return a response.
+    fastcgi_read_timeout 10s;
+  }
+
+}