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

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 7363e410cd3fe945b20463defa6917330d17ab89..d31b0bc3c049fd1916e70869a16e718977d3c641 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -41,20 +41,35 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
   conf "tile.conf.erb"
 end
 

+apache_conf "renderd" do
+  action :disable
+end
+

 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
 end
 
 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
 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] }
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }

+fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))

 
 apache_site "default" do
 
 apache_site "default" do

-  action [:disable]
+  action :disable
+end
+
+apache_site "tileserver_site" do
+  action :disable

 end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"
 end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"

-  variables :caches => tilecaches
+  variables :caches => tilecaches, :fastly => fastlyips["addresses"]

 end
 
 template "/etc/logrotate.d/apache2" do
 end
 
 template "/etc/logrotate.d/apache2" do


@@ -80,6 +95,7 @@ systemd_service "renderd" do
   exec_start "/usr/bin/renderd -f"
   runtime_directory "renderd"
   standard_error "null"
   exec_start "/usr/bin/renderd -f"
   runtime_directory "renderd"
   standard_error "null"

+  limit_nofile 4096

   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true


@@ -266,8 +282,10 @@ nodejs_package "carto"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
 
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"

+  conflicts "render-lowzoom.service"

   user "tile"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
   user "tile"
   exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"

+  runtime_directory "update-lowzoom-%i"

   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true


@@ -418,6 +436,21 @@ end
   end
 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]} -R www-data"
+    cwd "/srv/tile.openstreetmap.org"
+    user "tile"
+    group "tile"
+  end
+end
+

 postgresql_munin "gis" do
   cluster node[:tile][:database][:cluster]
   database "gis"
 postgresql_munin "gis" do
   cluster node[:tile][:database][:cluster]
   database "gis"


@@ -546,6 +579,7 @@ end
 
 systemd_service "render-lowzoom" do
   description "Render low zoom tiles"
 
 systemd_service "render-lowzoom" do
   description "Render low zoom tiles"

+  condition_path_exists_glob "!/run/update-lowzoom-*"

   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
   private_tmp true
   user "tile"
   exec_start "/usr/local/bin/render-lowzoom"
   private_tmp true


@@ -603,10 +637,10 @@ munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 
 
 munin_plugin "replication_delay"
 

-prometheus_collector "modtile" do
-  interval "1m"
+prometheus_exporter "modtile" do
+  port 9494

 end
 
 end
 

-prometheus_collector "renderd" do
-  interval "1m"
+prometheus_exporter "renderd" do
+  port 9393

 end
 end