From: Grant Slater <github@firefishy.com>
Date: Sat, 1 Feb 2025 21:48:27 +0000 (+0000)
Subject: imagery: allow mapserver to use network
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/3036293edf62100e23b29bd56f3cf5c8a4ff1fc7

imagery: allow mapserver to use network
---

diff --git a/cookbooks/imagery/recipes/au_act_aerial.rb b/cookbooks/imagery/recipes/au_act_aerial.rb
index 990e80788..cc0135998 100644
--- a/cookbooks/imagery/recipes/au_act_aerial.rb
+++ b/cookbooks/imagery/recipes/au_act_aerial.rb
@@ -47,7 +47,6 @@ imagery_layer "act_aerial_imagery_202311" do
   source "https://tiles.arcgis.com/tiles/E5n4f1VY84i0xSjy/arcgis/rest/services/ACT_Aerial_Imagery_202311/MapServer/WMTS/1.0.0/WMTSCapabilities.xml"
   # attribution per https://www.actmapi.act.gov.au/terms-and-conditions and https://tiles.arcgis.com/tiles/E5n4f1VY84i0xSjy/arcgis/rest/services/ACT_Aerial_Imagery_202311/MapServer/
   copyright "ACT Imagery from <a href='https://www.actmapi.act.gov.au/home'>ACTmapi</a> (c) Australian Capital Territory and MetroMap. "
-  default_layer true
   background_colour "0 0 0"
   extension "jpeg"
   max_zoom 22
@@ -60,7 +59,6 @@ imagery_layer "act_aerial_imagery_202305" do
   source "https://tiles.arcgis.com/tiles/E5n4f1VY84i0xSjy/arcgis/rest/services/ACT_Aerial_Imagery_202305/MapServer/WMTS/1.0.0/WMTSCapabilities.xml"
   # attribution per https://www.actmapi.act.gov.au/terms-and-conditions and https://tiles.arcgis.com/tiles/E5n4f1VY84i0xSjy/arcgis/rest/services/ACT_Aerial_Imagery_202305/MapServer/
   copyright "ACT Imagery from <a href='https://www.actmapi.act.gov.au/home'>ACTmapi</a> (c) Australian Capital Territory and MetroMap. "
-  default_layer true
   background_colour "0 0 0"
   extension "jpeg"
   max_zoom 22
diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 5eddb448c..81cc0ec90 100644
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -114,6 +114,7 @@ action :create do
     exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv"
     standard_input "socket"
     sandbox true
+    enable_network true
     restrict_address_families "AF_UNIX"
     timeout_stop_sec 60
     not_if { new_resource.uses_tiler }