From 148e2d6b4499a4ebd841391def5ff69e6b917a51 Mon Sep 17 00:00:00 2001
From: Petru Paler <petru@paler.net>
Date: Tue, 10 Sep 2024 18:34:11 +0100
Subject: [PATCH] WIP: random tweaks

---
 services/maps.hcl | 125 ++++++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 61 deletions(-)

diff --git a/services/maps.hcl b/services/maps.hcl
index c316c33..808e449 100644
--- a/services/maps.hcl
+++ b/services/maps.hcl
@@ -21,22 +21,25 @@ job "maps" {
         image = "3liz/qgis-map-server:3.38"
         ports = ["http"]
         volumes = [
-          "/data/shared/alo_gis:/projects",
-          "/data/compute/appdata/qgis-server-plugins:/plugins",
+          "/data/shared/alo_gis:/alo_gis",
+          "/data/compute/appdata/maps/qgis-server-plugins:/plugins",
         ]
       }
 
       env {
         QGSRV_API_ENABLED_LIZMAP = "yes"
+        QGSRV_API_ENDPOINTS_LIZMAP = "/ows/lizmap"
+        QGSRV_API_ENABLED_LANDING_PAGE = "yes"
+        QGIS_SERVER_LIZMAP_REVEAL_SETTINGS = "yes"
         QGSRV_SERVER_WORKERS = 4
-        QGSRV_SERVER_HTTP_PROXY = "yes"
-        QGSRV_SERVER_PROXY_URL = "https://mapserver.v.paler.net"
-        QGSRV_SERVER_PLUGINPATH = "/plugins"
         QGSRV_LOGGING_LEVEL = "INFO"
-        QGSRV_CACHE_ROOTDIR = "/projects"
+        QGSRV_SERVER_HTTP_PROXY = "yes"
+        #QGSRV_SERVER_PROXY_URL = "https://mapserver.v.paler.net"
+        QGSRV_SERVER_PLUGINPATH = "/plugins"
+        QGSRV_CACHE_ROOTDIR = "/alo_gis"
+        QGSRV_CACHE_STRICT_CHECK = "no"
         QGSRV_TRUST_LAYER_METADATA = "yes"
         QGSRV_DISABLE_GETPRINT = "yes"
-        QGIS_SERVER_LIZMAP_REVEAL_SETTINGS = "yes"
       }
 
       service {
@@ -57,58 +60,58 @@ job "maps" {
     }
   }
 
-  group "lizmap" {
-    network {
-      port "http" {
-        to = 8080
-      }
-    }
-
-    task "server" {
-      driver = "docker"
-
-      config {
-        image = "3liz/lizmap-web-client:3.8.0-rc.4"
-        ports = ["http"]
-        volumes = [
-          "/data/shared/alo_gis:/srv/projects",
-          "/data/compute/appdata/maps/var/lizmap-theme-config:/www/lizmap/var/lizmap-theme-config",
-          "/data/compute/appdata/maps/var/lizmap-config:/www/lizmap/var/config",
-          "/data/compute/appdata/maps/var/lizmap-db:/www/lizmap/var/db",
-          "/data/compute/appdata/maps/var/lizmap-log:/www/lizmap/var/log",
-          "/data/compute/appdata/maps/var/lizmap-modules:/www/lizmap/var/lizmap-modules",
-          "/data/compute/appdata/maps/var/lizmap-my-packages:/www/lizmap/var/my-packages",
-          "/data/compute/appdata/maps/www:/www/lizmap/www",
-          "/data/compute/appdata/maps/etc:/srv/etc:ro",
-        ]
-
-        command = "php-fpm"
-      }
-
-      env {
-        LIZMAP_CACHEREDISDB = "1"
-        LIZMAP_CACHEREDISHOST = "redis.service.consul"
-        LIZMAP_CACHESTORAGETYPE = "redis"
-        LIZMAP_HOME = "/srv/lizmap"
-        LIZMAP_WMSSERVERURL = "https://mapserver.v.paler.net/ows/"
-        LIZMAP_CONFIG_INCLUDE = "/srv/etc"
-      }
-
-      service {
-        name = "lizmap"
-        port = "http"
-
-        tags = [
-          "traefik.enable=true",
-          "traefik.http.routers.lizmap.entryPoints=websecure",
-          "traefik.http.routers.lizmap.middlewares=authentik@file",
-        ]
-      }
-
-      resources {
-        memory = 2000
-        cpu = 1000
-      }
-    }
-  }
+#  group "lizmap" {
+#    network {
+#      port "http" {
+#        to = 8080
+#      }
+#    }
+#
+#    task "server" {
+#      driver = "docker"
+#
+#      config {
+#        image = "3liz/lizmap-web-client:3.8.0-rc.4"
+#        ports = ["http"]
+#        volumes = [
+#          "/data/shared/alo_gis:/srv/projects",
+#          "/data/compute/appdata/maps/var/lizmap-theme-config:/www/lizmap/var/lizmap-theme-config",
+#          "/data/compute/appdata/maps/var/lizmap-config:/www/lizmap/var/config",
+#          "/data/compute/appdata/maps/var/lizmap-db:/www/lizmap/var/db",
+#          "/data/compute/appdata/maps/var/lizmap-log:/www/lizmap/var/log",
+#          "/data/compute/appdata/maps/var/lizmap-modules:/www/lizmap/var/lizmap-modules",
+#          "/data/compute/appdata/maps/var/lizmap-my-packages:/www/lizmap/var/my-packages",
+#          "/data/compute/appdata/maps/www:/www/lizmap/www",
+#          "/data/compute/appdata/maps/etc:/srv/etc:ro",
+#        ]
+#
+#        command = "php-fpm"
+#      }
+#
+#      env {
+#        LIZMAP_CACHEREDISDB = "1"
+#        LIZMAP_CACHEREDISHOST = "redis.service.consul"
+#        LIZMAP_CACHESTORAGETYPE = "redis"
+#        LIZMAP_HOME = "/srv/lizmap"
+#        LIZMAP_WMSSERVERURL = "https://mapserver.v.paler.net/ows/"
+#        LIZMAP_CONFIG_INCLUDE = "/srv/etc"
+#      }
+#
+#      service {
+#        name = "lizmap"
+#        port = "http"
+#
+#        tags = [
+#          "traefik.enable=true",
+#          "traefik.http.routers.lizmap.entryPoints=websecure",
+#          "traefik.http.routers.lizmap.middlewares=authentik@file",
+#        ]
+#      }
+#
+#      resources {
+#        memory = 2000
+#        cpu = 1000
+#      }
+#    }
+#  }
 }