WIP: random tweaks

This commit is contained in:
2024-09-10 18:34:11 +01:00
parent b12fc1ad86
commit 148e2d6b44

View File

@@ -21,22 +21,25 @@ job "maps" {
image = "3liz/qgis-map-server:3.38" image = "3liz/qgis-map-server:3.38"
ports = ["http"] ports = ["http"]
volumes = [ volumes = [
"/data/shared/alo_gis:/projects", "/data/shared/alo_gis:/alo_gis",
"/data/compute/appdata/qgis-server-plugins:/plugins", "/data/compute/appdata/maps/qgis-server-plugins:/plugins",
] ]
} }
env { env {
QGSRV_API_ENABLED_LIZMAP = "yes" 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_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_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_TRUST_LAYER_METADATA = "yes"
QGSRV_DISABLE_GETPRINT = "yes" QGSRV_DISABLE_GETPRINT = "yes"
QGIS_SERVER_LIZMAP_REVEAL_SETTINGS = "yes"
} }
service { service {
@@ -57,58 +60,58 @@ job "maps" {
} }
} }
group "lizmap" { # group "lizmap" {
network { # network {
port "http" { # port "http" {
to = 8080 # to = 8080
} # }
} # }
#
task "server" { # task "server" {
driver = "docker" # driver = "docker"
#
config { # config {
image = "3liz/lizmap-web-client:3.8.0-rc.4" # image = "3liz/lizmap-web-client:3.8.0-rc.4"
ports = ["http"] # ports = ["http"]
volumes = [ # volumes = [
"/data/shared/alo_gis:/srv/projects", # "/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-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-config:/www/lizmap/var/config",
"/data/compute/appdata/maps/var/lizmap-db:/www/lizmap/var/db", # "/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-log:/www/lizmap/var/log",
"/data/compute/appdata/maps/var/lizmap-modules:/www/lizmap/var/lizmap-modules", # "/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/var/lizmap-my-packages:/www/lizmap/var/my-packages",
"/data/compute/appdata/maps/www:/www/lizmap/www", # "/data/compute/appdata/maps/www:/www/lizmap/www",
"/data/compute/appdata/maps/etc:/srv/etc:ro", # "/data/compute/appdata/maps/etc:/srv/etc:ro",
] # ]
#
command = "php-fpm" # command = "php-fpm"
} # }
#
env { # env {
LIZMAP_CACHEREDISDB = "1" # LIZMAP_CACHEREDISDB = "1"
LIZMAP_CACHEREDISHOST = "redis.service.consul" # LIZMAP_CACHEREDISHOST = "redis.service.consul"
LIZMAP_CACHESTORAGETYPE = "redis" # LIZMAP_CACHESTORAGETYPE = "redis"
LIZMAP_HOME = "/srv/lizmap" # LIZMAP_HOME = "/srv/lizmap"
LIZMAP_WMSSERVERURL = "https://mapserver.v.paler.net/ows/" # LIZMAP_WMSSERVERURL = "https://mapserver.v.paler.net/ows/"
LIZMAP_CONFIG_INCLUDE = "/srv/etc" # LIZMAP_CONFIG_INCLUDE = "/srv/etc"
} # }
#
service { # service {
name = "lizmap" # name = "lizmap"
port = "http" # port = "http"
#
tags = [ # tags = [
"traefik.enable=true", # "traefik.enable=true",
"traefik.http.routers.lizmap.entryPoints=websecure", # "traefik.http.routers.lizmap.entryPoints=websecure",
"traefik.http.routers.lizmap.middlewares=authentik@file", # "traefik.http.routers.lizmap.middlewares=authentik@file",
] # ]
} # }
#
resources { # resources {
memory = 2000 # memory = 2000
cpu = 1000 # cpu = 1000
} # }
} # }
} # }
} }