From b1caf04245779e49b5402bd7ae20f421595621b0 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 1 Jul 2024 17:02:02 +0100 Subject: [PATCH] imagery: use titiler over socket --- cookbooks/imagery/recipes/default.rb | 7 +++++++ cookbooks/imagery/recipes/tiler.rb | 6 +++--- cookbooks/imagery/templates/default/nginx_imagery.conf.erb | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb index 9cf0692f2..3c04dd8a3 100644 --- a/cookbooks/imagery/recipes/default.rb +++ b/cookbooks/imagery/recipes/default.rb @@ -64,6 +64,13 @@ directory "/srv/imagery/common" do recursive true end +directory "/srv/imagery/sockets" do + owner "root" + group "root" + mode "777" + recursive true +end + # Pre-download uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for EPSG:27700 conversions execute "uk_os_OSTN15_NTv2_OSGBtoETRS.tif" do command "projsync --file uk_os_OSTN15_NTv2_OSGBtoETRS.tif --system-directory" diff --git a/cookbooks/imagery/recipes/tiler.rb b/cookbooks/imagery/recipes/tiler.rb index 7358089ac..cc115e7ac 100644 --- a/cookbooks/imagery/recipes/tiler.rb +++ b/cookbooks/imagery/recipes/tiler.rb @@ -37,9 +37,9 @@ container_image = if arm? podman_service "titiler" do description "Container service for titiler" image container_image - ports 8080 => 8080 - volume "/store/imagery" => "/store/imagery" - environment :PORT => 8080, + volume "/store/imagery" => "/store/imagery", + "/srv/imagery/sockets" => "/sockets" + environment :BIND => "unix:/sockets/titiler.sock", :WORKERS_PER_CORE => 1, :GDAL_CACHEMAX => 200, :GDAL_DISABLE_READDIR_ON_OPEN => "EMPTY_DIR", diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb index ea9730a95..81f829225 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -9,9 +9,9 @@ server { <% if @uses_tiler -%> upstream <%= @name %>_tiler_backend { - server 127.0.0.1:8080 max_fails=0; + server unix:/srv/imagery/sockets/titiler.sock max_fails=0; - keepalive 32; + keepalive 8; } <% else -%> upstream <%= @name %>_fastcgi { -- 2.39.5