From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 May 2024 07:05:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/668'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/40d704a6a1e8ef1ec71539bfa1f899fb57bc3cbb?hp=313c3b94bb413fbf8e68f215fb7c506bbac17ca5

Merge remote-tracking branch 'github/pull/668'
---

diff --git a/cookbooks/imagery/recipes/tiler.rb b/cookbooks/imagery/recipes/tiler.rb
index 028e8e34e..7358089ac 100644
--- a/cookbooks/imagery/recipes/tiler.rb
+++ b/cookbooks/imagery/recipes/tiler.rb
@@ -66,6 +66,10 @@ systemd_timer "titiler-restart" do
   on_unit_inactive_sec "12h"
 end
 
+service "titiler-restart.timer" do
+  action [:enable, :start]
+end
+
 directory "/var/cache/nginx-cache" do
   owner "www-data"
   group "www-data"
diff --git a/cookbooks/imagery/recipes/za_ngi_aerial.rb b/cookbooks/imagery/recipes/za_ngi_aerial.rb
index c0b564223..36123dcb5 100644
--- a/cookbooks/imagery/recipes/za_ngi_aerial.rb
+++ b/cookbooks/imagery/recipes/za_ngi_aerial.rb
@@ -31,7 +31,7 @@ imagery_layer "ngi-aerial" do
   uses_tiler true
   title "NGI Aerial 25cm/50cm"
   source "file:///store/imagery/za/za-25cm/mosaic-tiler-file.json"
-  copyright 'State Copyright &copy; 2024 <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
+  copyright 'State Copyright &copy; 2024 <a href="https://ngi.dalrrd.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
   max_zoom 20
   extension "jpg"
   default_layer true
diff --git a/cookbooks/imagery/recipes/za_ngi_topo.rb b/cookbooks/imagery/recipes/za_ngi_topo.rb
index 22cd752fa..46d0a8bc0 100644
--- a/cookbooks/imagery/recipes/za_ngi_topo.rb
+++ b/cookbooks/imagery/recipes/za_ngi_topo.rb
@@ -30,7 +30,7 @@ imagery_layer "za_ngi_topo_250k" do
   title "NGI Topo 250k"
   projection "EPSG:3857"
   source "/data/imagery/za/ngi-topo-250k/ngi-topo-250k-combined.vrt"
-  copyright 'State Copyright &copy; 1996&ndash;2010 <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
+  copyright 'State Copyright &copy; 1996&ndash;2010 <a href="https://ngi.dalrrd.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
   default_layer true
 end
 
@@ -39,5 +39,5 @@ imagery_layer "za_ngi_topo_50k" do
   title "NGI Topo 50k"
   projection "EPSG:3857"
   source "/data/imagery/za/ngi-topo-50k/ngi-topo-50k-combined.vrt"
-  copyright 'State Copyright &copy; 1996&ndash;2013 <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
+  copyright 'State Copyright &copy; 1996&ndash;2013 <a href="https://ngi.dalrrd.gov.za/">Chief Directorate: National Geo-spatial Information</a>'
 end