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

[chef.git] / cookbooks / tile / recipes / default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9b9f38930251ed6b989ef7ff71b9d8460d41a431..a41a9f361abc867094164f246ecc968a30287810 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -60,10 +60,7 @@ end
 fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))
 
 remote_file "#{Chef::Config[:file_cache_path]}/statuscake-locations.json" do
 fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))
 
 remote_file "#{Chef::Config[:file_cache_path]}/statuscake-locations.json" do

-  # source "https://app.statuscake.com/Workfloor/Locations.php?format=json"
-  # FIXME: StatusCake IP lookup. Use manual backup source for now. 13 Nov 2024
-  # https://www.statuscake.com/kb/knowledge-base/what-are-your-ips/
-  source "https://grant.dev.openstreetmap.org/statuscake-locations-patch.json"
+  source "https://app.statuscake.com/Workfloor/Locations.php?format=json"

   compile_time true
   ignore_failure true
 end
   compile_time true
   ignore_failure true
 end


@@ -671,7 +668,19 @@ tile_directories.each do |directory|
   end
 end
 
   end
 end
 

-package "ruby-webrick"
+package %w[
+  ruby-pg
+  ruby-webrick
+]
+
+prometheus_exporter "osm2pgsql" do
+  port 10027
+  user "tileupdate"
+  restrict_address_families "AF_UNIX"
+  options [
+    "--database-name=gis"
+  ]
+end

 
 prometheus_exporter "modtile" do
   port 9494
 
 prometheus_exporter "modtile" do
   port 9494