Allow read access for www-data to support the export script

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index a52c0aa66039e205b1fd8e59a84a31cf368d0e1a..f2bfd6a7b0929b39b148217a99cd12cbeabae83b 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -41,6 +41,10 @@ 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]"
 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"


@@ -49,18 +53,22 @@ end
 remote_file "#{Chef::Config[:file_cache_path]}/fastly-ip-list.json" do
   source "https://api.fastly.com/public-ip-list"
   compile_time true
 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
 
 end
 

-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
 fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))
 
 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, :fastly => fastlyips["addresses"]
+  variables :fastly => fastlyips["addresses"]

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


@@ -76,16 +84,24 @@ directory "/srv/tile.openstreetmap.org" do
   mode "755"
 end
 
   mode "755"
 end
 

+directory "/srv/tile.openstreetmap.org/conf" do
+  owner "tile"
+  group "tile"
+  mode "755"
+end
+
+file "/srv/tile.openstreetmap.org/conf/ip.map" do
+  owner "tile"
+  group "adm"
+  mode "644"
+end
+

 package "renderd"
 
 systemd_service "renderd" do
 package "renderd"
 
 systemd_service "renderd" do

-  description "Mapnik rendering daemon"
+  dropin "chef"

   after "postgresql.service"
   wants "postgresql.service"
   after "postgresql.service"
   wants "postgresql.service"

-  user "www-data"
-  exec_start "/usr/bin/renderd -f"
-  runtime_directory "renderd"
-  standard_error "null"

   limit_nofile 4096
   private_tmp true
   private_devices true
   limit_nofile 4096
   private_tmp true
   private_devices true


@@ -96,6 +112,10 @@ systemd_service "renderd" do
   restart "on-failure"
 end
 
   restart "on-failure"
 end
 

+systemd_service "renderd" do
+  action :delete
+end
+

 service "renderd" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[renderd]"
 service "renderd" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[renderd]"


@@ -273,8 +293,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


@@ -315,15 +337,15 @@ node[:tile][:styles].each do |name, details|
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do

-      owner "www-data"
-      group "www-data"
+      owner "_renderd"
+      group "_renderd"

       mode "755"
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
       mode "755"
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do

-        owner "www-data"
-        group "www-data"
+        owner "_renderd"
+        group "_renderd"

         mode "755"
       end
 
         mode "755"
       end
 


@@ -391,6 +413,10 @@ postgresql_user "www-data" do
   cluster node[:tile][:database][:cluster]
 end
 
   cluster node[:tile][:database][:cluster]
 end
 

+postgresql_user "_renderd" do
+  cluster node[:tile][:database][:cluster]
+end
+

 postgresql_database "gis" do
   cluster node[:tile][:database][:cluster]
   owner "tile"
 postgresql_database "gis" do
   cluster node[:tile][:database][:cluster]
   owner "tile"


@@ -421,7 +447,32 @@ end
     cluster node[:tile][:database][:cluster]
     database "gis"
     owner "tile"
     cluster node[:tile][:database][:cluster]
     database "gis"
     owner "tile"

-    permissions "tile" => :all, "www-data" => :select
+    permissions "tile" => :all, "www-data" => :select, "_renderd" => :select
+  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 _renderd"
+    cwd "/srv/tile.openstreetmap.org"
+    user "tile"
+    group "tile"
+    ignore_failure true
+  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, "_renderd" => :select
+    end

   end
 end
 
   end
 end
 


@@ -439,7 +490,7 @@ end
 
 file node[:tile][:database][:node_file] do
   owner "tile"
 
 file node[:tile][:database][:node_file] do
   owner "tile"

-  group "www-data"
+  group "_renderd"

   mode "660"
 end
 
   mode "660"
 end
 


@@ -457,6 +508,10 @@ package %w[
   python3-pyproj
 ]
 
   python3-pyproj
 ]
 

+gem_package "apachelogregex"
+gem_package "file-tail"
+gem_package "lru_redux"
+

 remote_directory "/usr/local/bin" do
   source "bin"
   owner "root"
 remote_directory "/usr/local/bin" do
   source "bin"
   owner "root"


@@ -467,6 +522,35 @@ remote_directory "/usr/local/bin" do
   files_mode "755"
 end
 
   files_mode "755"
 end
 

+template "/usr/local/bin/tile-ratelimit" do
+  source "tile-ratelimit.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end
+
+systemd_service "tile-ratelimit" do
+  description "Monitor tile requests and enforce rate limits"
+  after "apache2.service"
+  user "tile"
+  group "adm"
+  exec_start "/usr/local/bin/tile-ratelimit"
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "full"
+  protect_home true
+  read_write_paths "/srv/tile.openstreetmap.org/conf"
+  no_new_privileges true
+  restart "on-failure"
+end
+
+service "tile-ratelimit" do
+  action [:enable, :start]
+  subscribes :restart, "file[/usr/local/bin/tile-ratelimit]"
+  subscribes :restart, "systemd_service[tile-ratelimit]"
+end
+

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


@@ -482,7 +566,7 @@ end
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"
 
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"

-  group "www-data"
+  group "_renderd"

   mode "775"
 end
 
   mode "775"
 end
 


@@ -497,7 +581,7 @@ end
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
   type "simple"
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
   type "simple"

-  user "www-data"
+  user "_renderd"

   exec_start "/usr/local/bin/expire-tiles"
   standard_output "null"
   private_tmp true
   exec_start "/usr/local/bin/expire-tiles"
   standard_output "null"
   private_tmp true


@@ -553,6 +637,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


@@ -591,7 +676,7 @@ tile_directories.each do |directory|
 
   cron_d "cleanup-tiles#{label}" do
     minute "0"
 
   cron_d "cleanup-tiles#{label}" do
     minute "0"

-    user "www-data"
+    user "_renderd"

     command "ionice -c 3 /usr/local/bin/cleanup-tiles #{directory}"
     mailto "admins@openstreetmap.org"
   end
     command "ionice -c 3 /usr/local/bin/cleanup-tiles #{directory}"
     mailto "admins@openstreetmap.org"
   end


@@ -610,14 +695,6 @@ munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 
 
 munin_plugin "replication_delay"
 

-prometheus_collector "modtile" do
-  action :delete
-end
-
-prometheus_collector "renderd" do
-  action :delete
-end
-

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