From 3036293edf62100e23b29bd56f3cf5c8a4ff1fc7 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 1 Feb 2025 21:48:27 +0000 Subject: [PATCH 01/16] imagery: allow mapserver to use network --- cookbooks/imagery/recipes/au_act_aerial.rb | 2 -- cookbooks/imagery/resources/site.rb | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) 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 ACTmapi (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 ACTmapi (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 } -- 2.39.5 From e577f4b880f256b42d150d55a903935815773e77 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 1 Feb 2025 21:51:03 +0000 Subject: [PATCH 02/16] imagery: fix networking --- cookbooks/imagery/resources/site.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index 81cc0ec90..5511036c8 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -113,8 +113,7 @@ action :create do group "imagery" exec_start "/usr/bin/multiwatch -f 8 --signal=TERM -- /usr/lib/cgi-bin/mapserv" standard_input "socket" - sandbox true - enable_network true + sandbox :enable_network => true restrict_address_families "AF_UNIX" timeout_stop_sec 60 not_if { new_resource.uses_tiler } -- 2.39.5 From ca9bbc9876c8ea5396499e7668038cfd8438149d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 3 Feb 2025 01:59:34 +0000 Subject: [PATCH 03/16] geodns: Add extra rsync geodns allow list IPs --- roles/geodns.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/geodns.rb b/roles/geodns.rb index a2ad092f3..a1df01532 100644 --- a/roles/geodns.rb +++ b/roles/geodns.rb @@ -12,8 +12,10 @@ default_attributes( :list => false, :transfer_logging => false, :hosts_allow => [ - "184.104.226.102", # idris - "2001:470:1:b3b::6" # idris + "184.104.226.102", # idris HE + "2001:470:1:b3b::6", # idris HE + "87.252.214.102", # idris Equinix + "2001:4d78:fe03:1c::6" # idris Equinix ] } } -- 2.39.5 From f8522ae63e215cb38601a99058fca2b625efa35a Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Mon, 3 Feb 2025 11:33:14 +1100 Subject: [PATCH 04/16] add city of melbourne imagery --- .../recipes/au_vic_melbourne_aerial.rb | 60 +++++++++++++++++++ roles/imagery.rb | 1 + 2 files changed, 61 insertions(+) create mode 100644 cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb diff --git a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb new file mode 100644 index 000000000..a05823545 --- /dev/null +++ b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb @@ -0,0 +1,60 @@ +# +# Cookbook:: imagery +# Recipe:: au_vic_melbourne_aerial +# +# Copyright:: 2024, OpenStreetMap Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +include_recipe "imagery::tiler" + +imagery_site "au-vic-melbourne-imagery.openstreetmap.org" do + title "OpenStreetMap - City of Melbourne - Aerial Imagery" + aliases ["au-vic-melbourne-imagery.osm.org"] + # https://leafletjs.com/reference.html#latlngbounds format + # [[south, west], [north, east]] + bbox [[-37.850667, 144.896981], [-37.775451, 144.991351]] + uses_tiler true +end + +imagery_layer "melbourne-2020" do + site "au-vic-melbourne-imagery.openstreetmap.org" + uses_tiler true + title "AU City of Melbourne 2020" + source "file:///store/imagery/au/city-of-melbourne/CoM_May2020_2cm.cog.tiff" + copyright "(c) 2020 City of Melbourne" + max_zoom 23 + extension "jpg" + default_layer true +end + +imagery_layer "melbourne-2019" do + site "au-vic-melbourne-imagery.openstreetmap.org" + uses_tiler true + title "AU City of Melbourne 2019" + source "file:///store/imagery/au/city-of-melbourne/CoM_03Feb2019.cog.tiff" + copyright "(c) 2019 City of Melbourne" + max_zoom 21 + extension "jpg" +end + +imagery_layer "melbourne-2018" do + site "au-vic-melbourne-imagery.openstreetmap.org" + uses_tiler true + title "AU City of Melbourne 2018" + source "file:///store/imagery/au/city-of-melbourne/CoM_May2018_10cm.COG.tiff" + copyright "(c) 2018 City of Melbourne" + max_zoom 21 + extension "jpg" +end diff --git a/roles/imagery.rb b/roles/imagery.rb index cc4dc454c..f024515a9 100644 --- a/roles/imagery.rb +++ b/roles/imagery.rb @@ -36,6 +36,7 @@ default_attributes( run_list( "recipe[imagery::au_agri]", "recipe[imagery::au_act_aerial]", + "recipe[imagery::au_vic_melbourne_aerial]", "recipe[imagery::gb_ea]", "recipe[imagery::gb_hampshire_aerial]", "recipe[imagery::gb_os_sv]", -- 2.39.5 From 6bed11692085e79a7201e3b9a15492482ad0fdb7 Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Mon, 3 Feb 2025 11:35:40 +1100 Subject: [PATCH 05/16] shorter layer titles --- cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb index a05823545..85877bb93 100644 --- a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb +++ b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb @@ -31,7 +31,7 @@ end imagery_layer "melbourne-2020" do site "au-vic-melbourne-imagery.openstreetmap.org" uses_tiler true - title "AU City of Melbourne 2020" + title "City of Melbourne 2020" source "file:///store/imagery/au/city-of-melbourne/CoM_May2020_2cm.cog.tiff" copyright "(c) 2020 City of Melbourne" max_zoom 23 @@ -42,7 +42,7 @@ end imagery_layer "melbourne-2019" do site "au-vic-melbourne-imagery.openstreetmap.org" uses_tiler true - title "AU City of Melbourne 2019" + title "City of Melbourne 2019" source "file:///store/imagery/au/city-of-melbourne/CoM_03Feb2019.cog.tiff" copyright "(c) 2019 City of Melbourne" max_zoom 21 @@ -52,7 +52,7 @@ end imagery_layer "melbourne-2018" do site "au-vic-melbourne-imagery.openstreetmap.org" uses_tiler true - title "AU City of Melbourne 2018" + title "City of Melbourne 2018" source "file:///store/imagery/au/city-of-melbourne/CoM_May2018_10cm.COG.tiff" copyright "(c) 2018 City of Melbourne" max_zoom 21 -- 2.39.5 From 4d80085c409a6fd587ebf1d734d8dbe82b4004e1 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 3 Feb 2025 02:03:14 +0000 Subject: [PATCH 06/16] imagery: switch au melborne aerial to mapserver --- cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb index 85877bb93..14e8804e7 100644 --- a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb +++ b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb @@ -17,7 +17,7 @@ # limitations under the License. # -include_recipe "imagery::tiler" +include_recipe "imagery" imagery_site "au-vic-melbourne-imagery.openstreetmap.org" do title "OpenStreetMap - City of Melbourne - Aerial Imagery" @@ -25,12 +25,10 @@ imagery_site "au-vic-melbourne-imagery.openstreetmap.org" do # https://leafletjs.com/reference.html#latlngbounds format # [[south, west], [north, east]] bbox [[-37.850667, 144.896981], [-37.775451, 144.991351]] - uses_tiler true end imagery_layer "melbourne-2020" do site "au-vic-melbourne-imagery.openstreetmap.org" - uses_tiler true title "City of Melbourne 2020" source "file:///store/imagery/au/city-of-melbourne/CoM_May2020_2cm.cog.tiff" copyright "(c) 2020 City of Melbourne" @@ -41,7 +39,6 @@ end imagery_layer "melbourne-2019" do site "au-vic-melbourne-imagery.openstreetmap.org" - uses_tiler true title "City of Melbourne 2019" source "file:///store/imagery/au/city-of-melbourne/CoM_03Feb2019.cog.tiff" copyright "(c) 2019 City of Melbourne" @@ -51,7 +48,6 @@ end imagery_layer "melbourne-2018" do site "au-vic-melbourne-imagery.openstreetmap.org" - uses_tiler true title "City of Melbourne 2018" source "file:///store/imagery/au/city-of-melbourne/CoM_May2018_10cm.COG.tiff" copyright "(c) 2018 City of Melbourne" -- 2.39.5 From 60c2cdedeebc4f3de46881c6933abc49a373aaea Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 3 Feb 2025 02:08:20 +0000 Subject: [PATCH 07/16] imagery: make au melbourne file paths mapserver compatible --- cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb index 14e8804e7..55988dccb 100644 --- a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb +++ b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb @@ -30,7 +30,7 @@ end imagery_layer "melbourne-2020" do site "au-vic-melbourne-imagery.openstreetmap.org" title "City of Melbourne 2020" - source "file:///store/imagery/au/city-of-melbourne/CoM_May2020_2cm.cog.tiff" + source "/store/imagery/au/city-of-melbourne/CoM_May2020_2cm.cog.tiff" copyright "(c) 2020 City of Melbourne" max_zoom 23 extension "jpg" @@ -40,7 +40,7 @@ end imagery_layer "melbourne-2019" do site "au-vic-melbourne-imagery.openstreetmap.org" title "City of Melbourne 2019" - source "file:///store/imagery/au/city-of-melbourne/CoM_03Feb2019.cog.tiff" + source "/store/imagery/au/city-of-melbourne/CoM_03Feb2019.cog.tiff" copyright "(c) 2019 City of Melbourne" max_zoom 21 extension "jpg" @@ -49,7 +49,7 @@ end imagery_layer "melbourne-2018" do site "au-vic-melbourne-imagery.openstreetmap.org" title "City of Melbourne 2018" - source "file:///store/imagery/au/city-of-melbourne/CoM_May2018_10cm.COG.tiff" + source "/store/imagery/au/city-of-melbourne/CoM_May2018_10cm.COG.tiff" copyright "(c) 2018 City of Melbourne" max_zoom 21 extension "jpg" -- 2.39.5 From 46fff41f76eb4b09fd296bf83faa26889d8333dc Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 3 Feb 2025 02:15:31 +0000 Subject: [PATCH 08/16] imagery: final melbourne mapserver compatibility fixes --- cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb index 55988dccb..cda5e80d4 100644 --- a/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb +++ b/cookbooks/imagery/recipes/au_vic_melbourne_aerial.rb @@ -33,7 +33,8 @@ imagery_layer "melbourne-2020" do source "/store/imagery/au/city-of-melbourne/CoM_May2020_2cm.cog.tiff" copyright "(c) 2020 City of Melbourne" max_zoom 23 - extension "jpg" + extension "jpeg" + revision 2 default_layer true end @@ -43,7 +44,8 @@ imagery_layer "melbourne-2019" do source "/store/imagery/au/city-of-melbourne/CoM_03Feb2019.cog.tiff" copyright "(c) 2019 City of Melbourne" max_zoom 21 - extension "jpg" + extension "jpeg" + revision 2 end imagery_layer "melbourne-2018" do @@ -52,5 +54,6 @@ imagery_layer "melbourne-2018" do source "/store/imagery/au/city-of-melbourne/CoM_May2018_10cm.COG.tiff" copyright "(c) 2018 City of Melbourne" max_zoom 21 - extension "jpg" + extension "jpeg" + revision 2 end -- 2.39.5 From 24b4995f48385560ec2a51672f1113f02dadd4cd Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 3 Feb 2025 14:39:00 +0000 Subject: [PATCH 09/16] mediawiki: pin data-values composer dependencies to avoid breakage --- .../mediawiki/templates/default/composer.local.json.erb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cookbooks/mediawiki/templates/default/composer.local.json.erb b/cookbooks/mediawiki/templates/default/composer.local.json.erb index 73678e1cc..338a0de9d 100644 --- a/cookbooks/mediawiki/templates/default/composer.local.json.erb +++ b/cookbooks/mediawiki/templates/default/composer.local.json.erb @@ -8,6 +8,13 @@ } }, "require": { - "guzzlehttp/psr7": "2.4.5" + "guzzlehttp/psr7": "2.4.5", + "data-values/common": "1.0.0", + "data-values/data-values": "3.0.0", + "data-values/geo": "4.2.3", + "data-values/interfaces": "1.0.0", + "data-values/number": "0.11.1", + "data-values/serialization": "1.2.4", + "data-values/time": "1.0.4" } } -- 2.39.5 From 5509e718aab0cba4ed8334bd7b310f7b85b61302 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 6 Feb 2025 23:29:34 +0000 Subject: [PATCH 10/16] community: Upgrade discourse to v3.3.4 with pg15 upgrade --- cookbooks/community/recipes/default.rb | 2 +- cookbooks/community/templates/default/data.yml.erb | 4 ++-- cookbooks/community/templates/default/web_only.yml.erb | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb index 51c4624ea..4d34b3901 100644 --- a/cookbooks/community/recipes/default.rb +++ b/cookbooks/community/recipes/default.rb @@ -63,7 +63,7 @@ git "/srv/community.openstreetmap.org/docker" do action :sync repository "https://github.com/discourse/discourse_docker.git" # DANGER launch wrapper automatically updates git repo if rebuild method used: https://github.com/discourse/discourse_docker/blob/107ffb40fe8b1ea40e00814468db974a4f3f8e8f/launcher#L799 - revision "136c63890674b95df1327d24270c55e4ef8e87a8" + revision "efd6bc8ccbd9057c04d909ff48ecf8b704cae3ff" user "root" group "root" notifies :run, "notify_group[discourse_container_new_data]" diff --git a/cookbooks/community/templates/default/data.yml.erb b/cookbooks/community/templates/default/data.yml.erb index c5c59d288..37573874e 100644 --- a/cookbooks/community/templates/default/data.yml.erb +++ b/cookbooks/community/templates/default/data.yml.erb @@ -3,7 +3,7 @@ # templates: - - "templates/postgres.13.template.yml" # NOTE UPDATE THE HOOK REPLACE FOR MAX CONNECTIONS BELOW + - "templates/postgres.15.template.yml" # NOTE UPDATE THE HOOK REPLACE FOR MAX CONNECTIONS BELOW - "templates/redis.template.yml" # any extra arguments for Docker? @@ -51,6 +51,6 @@ hooks: run: # Make sure this matches the postgresql version template above - replace: - filename: "/etc/postgresql/13/main/postgresql.conf" + filename: "/etc/postgresql/15/main/postgresql.conf" from: /#?max_connections *=.*/ to: "max_connections = $db_max_connections" diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb index 5beef4802..0af44f738 100644 --- a/cookbooks/community/templates/default/web_only.yml.erb +++ b/cookbooks/community/templates/default/web_only.yml.erb @@ -19,7 +19,7 @@ links: # any extra arguments for Docker? # docker_args: -# Latest Version v3.3.3 +# Latest Version v3.3.4 # Discourse only support tests-passed and stable branches params: version: stable @@ -121,7 +121,6 @@ hooks: from: /listen 80;/ to: | listen 80; - listen [::]:80; rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent; - replace: -- 2.39.5 From 85657d16a186f3395f8b3167fdfa2337ba052f4d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 7 Feb 2025 00:06:58 +0000 Subject: [PATCH 11/16] community: upgrade to v3.4.0 --- cookbooks/community/templates/default/web_only.yml.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb index 0af44f738..5382aebfe 100644 --- a/cookbooks/community/templates/default/web_only.yml.erb +++ b/cookbooks/community/templates/default/web_only.yml.erb @@ -19,7 +19,7 @@ links: # any extra arguments for Docker? # docker_args: -# Latest Version v3.3.4 +# Latest Version v3.4.0 # Discourse only support tests-passed and stable branches params: version: stable @@ -121,6 +121,7 @@ hooks: from: /listen 80;/ to: | listen 80; + listen [::]:80; rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent; - replace: -- 2.39.5 From e5e8b32a5edec9e18da899bb6b061cc5ccb77381 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 7 Feb 2025 00:09:50 +0000 Subject: [PATCH 12/16] community: postgres upgrades require 2nd rebuild on upgrade --- cookbooks/community/recipes/default.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb index 4d34b3901..6ba216013 100644 --- a/cookbooks/community/recipes/default.rb +++ b/cookbooks/community/recipes/default.rb @@ -155,6 +155,7 @@ execute "discourse_container_data_bootstrap" do cwd "/srv/community.openstreetmap.org/docker/" user "root" group "root" + retries 2 # Postgres upgrades required a second run end execute "discourse_container_data_destroy" do -- 2.39.5 From 6a617bb20948addbaf4a09a796be9ff7015757fa Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 7 Feb 2025 00:21:03 +0000 Subject: [PATCH 13/16] imagery: tune gdal http connections --- cookbooks/imagery/resources/site.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index 5511036c8..0d46526ce 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -105,7 +105,9 @@ action :create do description "Map server for #{new_resource.site} layer" environment "MS_DEBUGLEVEL" => "0", "MS_ERRORFILE" => "stderr", - "GDAL_CACHEMAX" => "128" + "GDAL_CACHEMAX" => "128", + "GDAL_HTTP_TCP_KEEPALIVE" => "YES", + "GDAL_HTTP_VERSION" => "2TLS" limit_nofile 16384 memory_high "12G" memory_max "12G" @@ -154,7 +156,7 @@ action :create do systemd_timer "mapserv-fcgi-#{new_resource.site}-stop" do on_boot_sec "10m" - on_unit_inactive_sec "30m" + on_unit_inactive_sec "6h" randomized_delay_sec "20m" not_if { new_resource.uses_tiler } end -- 2.39.5 From ad7ef691631c610a7b35bf7417c51d7578310b0b Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 7 Feb 2025 04:23:01 +0000 Subject: [PATCH 14/16] imagery: Disable WMS cache for now. Permissions do now allow --- cookbooks/imagery/resources/site.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb index 0d46526ce..6a20594c7 100644 --- a/cookbooks/imagery/resources/site.rb +++ b/cookbooks/imagery/resources/site.rb @@ -107,7 +107,8 @@ action :create do "MS_ERRORFILE" => "stderr", "GDAL_CACHEMAX" => "128", "GDAL_HTTP_TCP_KEEPALIVE" => "YES", - "GDAL_HTTP_VERSION" => "2TLS" + "GDAL_HTTP_VERSION" => "2TLS", + "GDAL_ENABLE_WMS_CACHE" => "NO" limit_nofile 16384 memory_high "12G" memory_max "12G" -- 2.39.5 From 54d0b9bfa9c61573cd2d601052eede9de396d23d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 7 Feb 2025 04:59:14 +0000 Subject: [PATCH 15/16] community: fix the acme redirect templating madness --- .../community/templates/default/web_only.yml.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb index 5382aebfe..cdced0a8a 100644 --- a/cookbooks/community/templates/default/web_only.yml.erb +++ b/cookbooks/community/templates/default/web_only.yml.erb @@ -116,14 +116,6 @@ hooks: cmd: - sudo -H -E -u discourse cp /shared/feeds/update-feeds.atom public/update-feeds.atom after_ssl: - - replace: - filename: "/etc/nginx/conf.d/discourse.conf" - from: /listen 80;/ - to: | - listen 80; - listen [::]:80; - rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent; - - replace: filename: "/etc/nginx/conf.d/discourse.conf" from: /add_header.+/ @@ -133,3 +125,11 @@ hooks: resolver <%= @resolvers.join(" ") %>; resolver_timeout 5s; ssl_dhparam /shared/ssl/dhparam.pem; + +run: + - replace: + filename: "/etc/nginx/conf.d/discourse.conf" + from: /return 301.+/ + to: | + rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent; + return 301 https://$$ENV_DISCOURSE_HOSTNAME$request_uri; -- 2.39.5 From 8976ad644be498d72e248408b49375d20315b264 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Fri, 7 Feb 2025 05:19:58 +0000 Subject: [PATCH 16/16] community: fix port 80 not being IPv6 enabled --- cookbooks/community/templates/default/web_only.yml.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb index cdced0a8a..e7fd3665c 100644 --- a/cookbooks/community/templates/default/web_only.yml.erb +++ b/cookbooks/community/templates/default/web_only.yml.erb @@ -129,7 +129,8 @@ hooks: run: - replace: filename: "/etc/nginx/conf.d/discourse.conf" - from: /return 301.+/ + from: /listen 80;/ to: | + listen 80; + listen [::]:80; rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent; - return 301 https://$$ENV_DISCOURSE_HOSTNAME$request_uri; -- 2.39.5