Allow external data script to grant render permission

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index c5dc7c87fa047c1434840043d223103f1426bf94..0f8cd93035b3ce41eb4ad018d72a06014d5cefb6 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -23,6 +23,7 @@ include_recipe "git"
 include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "postgresql"

+include_recipe "prometheus"

 include_recipe "python"
 include_recipe "tools"
 
 include_recipe "python"
 include_recipe "tools"
 


@@ -45,7 +46,14 @@ ssl_certificate node[:fqdn] do
   notifies :reload, "service[apache2]"
 end
 
   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
   action [:disable]
 
 apache_site "default" do
   action [:disable]


@@ -53,20 +61,20 @@ end
 
 apache_site "tile.openstreetmap.org" do
   template "apache.erb"
 
 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
   source "logrotate.apache.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"
 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 package "renderd"
 end
 
 package "renderd"


@@ -79,6 +87,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


@@ -96,14 +105,14 @@ end
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/tiles" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end
   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end


@@ -112,17 +121,17 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   source "html"
   owner "tile"
   group "tile"
   source "html"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

   files_owner "tile"
   files_group "tile"
   files_owner "tile"
   files_group "tile"

-  files_mode 0o644
+  files_mode "644"

 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"
 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"

-  mode 0o644
+  mode "644"

 end
 
 package %w[
 end
 
 package %w[


@@ -149,21 +158,21 @@ package %w[
     source "https://github.com/googlei18n/noto-fonts/raw/master/hinted/#{font}"
     owner "root"
     group "root"
     source "https://github.com/googlei18n/noto-fonts/raw/master/hinted/#{font}"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

   end
 end
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
   end
 end
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

   variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
 end
 
   variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
 end
 


@@ -171,20 +180,20 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   source "debug.erb"
   owner "tile"
   group "tile"
   source "debug.erb"
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 package "mapnik-utils"
 end
 
 package "mapnik-utils"


@@ -199,7 +208,7 @@ node[:tile][:data].each_value do |data|
     directory directory do
       owner "tile"
       group "tile"
     directory directory do
       owner "tile"
       group "tile"

-      mode 0o755
+      mode "755"

     end
   else
     directory = "/srv/tile.openstreetmap.org/data"
     end
   else
     directory = "/srv/tile.openstreetmap.org/data"


@@ -254,7 +263,7 @@ node[:tile][:data].each_value do |data|
     source url
     owner "tile"
     group "tile"
     source url
     owner "tile"
     group "tile"

-    mode 0o644
+    mode "644"

     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"
     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"


@@ -265,8 +274,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


@@ -279,7 +290,7 @@ end
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 node[:tile][:styles].each do |name, details|
 end
 
 node[:tile][:styles].each do |name, details|


@@ -290,7 +301,7 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.erb"
     owner "root"
     group "root"
     source "update-lowzoom.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

     variables :style => name
   end
 
     variables :style => name
   end
 


@@ -302,21 +313,21 @@ node[:tile][:styles].each do |name, details|
   directory tile_directory do
     owner "tile"
     group "tile"
   directory tile_directory do
     owner "tile"
     group "tile"

-    mode 0o755
+    mode "755"

   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
       owner "www-data"
       group "www-data"
   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
       owner "www-data"
       group "www-data"

-      mode 0o755
+      mode "755"

     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"

-        mode 0o755
+        mode "755"

       end
 
       link "#{tile_directory}/#{zoom}" do
       end
 
       link "#{tile_directory}/#{zoom}" do


@@ -331,7 +342,7 @@ node[:tile][:styles].each do |name, details|
     action :create_if_missing
     owner "tile"
     group "tile"
     action :create_if_missing
     owner "tile"
     group "tile"

-    mode 0o444
+    mode "444"

   end
 
   git style_directory do
   end
 
   git style_directory do


@@ -417,6 +428,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"


@@ -425,20 +451,20 @@ end
 directory File.dirname(node[:tile][:database][:node_file]) do
   owner "root"
   group "root"
 directory File.dirname(node[:tile][:database][:node_file]) do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
 file node[:tile][:database][:node_file] do
   owner "tile"
   group "www-data"
   recursive true
 end
 
 file node[:tile][:database][:node_file] do
   owner "tile"
   group "www-data"

-  mode 0o660
+  mode "660"

 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"
 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 package %w[
 end
 
 package %w[


@@ -453,36 +479,36 @@ remote_directory "/usr/local/bin" do
   source "bin"
   owner "root"
   group "root"
   source "bin"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0o755
+  files_mode "755"

 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"

-  mode 0o755
+  mode "755"

 end
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"
   group "www-data"
 end
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"
   group "www-data"

-  mode 0o775
+  mode "775"

 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   variables :postgresql_version => postgresql_version.to_f
 end
 
   variables :postgresql_version => postgresql_version.to_f
 end
 


@@ -533,18 +559,19 @@ template "/etc/logrotate.d/replicate" do
   source "replicate.logrotate.erb"
   owner "root"
   group "root"
   source "replicate.logrotate.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 systemd_service "render-lowzoom" do
   description "Render low zoom tiles"
 end
 
 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


@@ -571,17 +598,13 @@ template "/usr/local/bin/cleanup-tiles" do
   source "cleanup-tiles.erb"
   owner "root"
   group "root"
   source "cleanup-tiles.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 
 end
 
 tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 

-file "/etc/cron.d/cleanup-tiles" do
-  action :delete
-end
-

 tile_directories.each do |directory|
   label = directory.gsub("/", "-")
 
 tile_directories.each do |directory|
   label = directory.gsub("/", "-")
 


@@ -605,3 +628,11 @@ munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"

+
+prometheus_exporter "modtile" do
+  port 9494
+end
+
+prometheus_exporter "renderd" do
+  port 9393
+end