X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c21a743049e784dba40c58d00379dc62d578cdb9..c87a97890768b4427f078d7deda0d1edf4bb39ce:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 154ce68fd..5299a3e38 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -49,6 +49,7 @@ end
 remote_file "#{Chef::Config[:file_cache_path]}/fastly-ip-list.json" do
   source "https://api.fastly.com/public-ip-list"
   compile_time true
+  ignore_failure true
 end
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
@@ -425,6 +426,30 @@ end
   end
 end
 
+package %w[
+  gdal-bin
+  python3-yaml
+  python3-psycopg2
+]
+
+if node[:tile][:database][:external_data_script]
+  execute node[:tile][:database][:external_data_script] do
+    command node[:tile][:database][:external_data_script]
+    cwd "/srv/tile.openstreetmap.org"
+    user "tile"
+    group "tile"
+  end
+
+  Array(node[:tile][:database][:external_data_tables]).each do |table|
+    postgresql_table table do
+      cluster node[:tile][:database][:cluster]
+      database "gis"
+      owner "tile"
+      permissions "tile" => :all, "www-data" => :select
+    end
+  end
+end
+
 postgresql_munin "gis" do
   cluster node[:tile][:database][:cluster]
   database "gis"
@@ -610,10 +635,10 @@ munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 
-prometheus_collector "modtile" do
-  interval "1m"
+prometheus_exporter "modtile" do
+  port 9494
 end
 
-prometheus_collector "renderd" do
-  interval "1m"
+prometheus_exporter "renderd" do
+  port 9393
 end