oxidized: remove explicit auth_methods

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 1bc45e92f92082b6629ace57305104967120bb01..d726a2220cb6783ca1179403a7f455fd9aab5447 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -25,6 +25,7 @@ include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "prometheus"
 include_recipe "python"
 include_recipe "postgresql"
 include_recipe "prometheus"
 include_recipe "python"

+include_recipe "ruby"

 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")


@@ -99,13 +100,9 @@ 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


@@ -116,6 +113,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]"


@@ -156,6 +157,7 @@ end
 package %w[
   python3-cairo
   python3-mapnik
 package %w[
   python3-cairo
   python3-mapnik

+  python3-pyproj

   python3-setuptools
 ]
 
   python3-setuptools
 ]
 


@@ -163,24 +165,6 @@ python_package "pyotp" do
   python_version "3"
 end
 
   python_version "3"
 end
 

-package %w[
-  fonts-noto-cjk
-  fonts-noto-hinted
-  fonts-noto-unhinted
-  fonts-hanazono
-  ttf-unifont
-]
-
-["NotoSansArabicUI-Regular.ttf", "NotoSansArabicUI-Bold.ttf"].each do |font|
-  remote_file "/usr/share/fonts/truetype/noto/#{font}" do
-    action :create_if_missing
-    source "https://github.com/googlei18n/noto-fonts/raw/master/hinted/#{font}"
-    owner "root"
-    group "root"
-    mode "644"
-  end
-end
-

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


@@ -337,15 +321,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
 


@@ -378,6 +362,17 @@ node[:tile][:styles].each do |name, details|
     group "tile"
   end
 
     group "tile"
   end
 

+  if details[:fonts_script]
+    execute details[:fonts_script] do
+      action :nothing
+      command details[:fonts_script]
+      cwd style_directory
+      user "tile"
+      group "tile"
+      subscribes :run, "git[#{style_directory}]"
+    end
+  end
+

   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.0 project.mml > project.xml"
   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.0 project.mml > project.xml"


@@ -405,6 +400,11 @@ postgresql_user "tomh" do
   superuser true
 end
 
   superuser true
 end
 

+postgresql_user "pnorman" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+

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


@@ -413,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"


@@ -443,7 +447,7 @@ 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
 
   end
 end
 


@@ -455,10 +459,20 @@ package %w[
 
 if node[:tile][:database][:external_data_script]
   execute node[:tile][:database][:external_data_script] do
 
 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"
+    command "#{node[:tile][:database][:external_data_script]} -R _renderd"

     cwd "/srv/tile.openstreetmap.org"
     user "tile"
     group "tile"
     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
 


@@ -476,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
 


@@ -488,15 +502,22 @@ end
 
 package %w[
   osm2pgsql
 
 package %w[
   osm2pgsql

-  ruby

   osmium-tool
   pyosmium
   python3-pyproj
 ]
 
   osmium-tool
   pyosmium
   python3-pyproj
 ]
 

-gem_package "apachelogregex"
-gem_package "file-tail"
-gem_package "lru_redux"
+gem_package "apachelogregex" do
+  gem_binary node[:ruby][:gem]
+end
+
+gem_package "file-tail" do
+  gem_binary node[:ruby][:gem]
+end
+
+gem_package "lru_redux" do
+  gem_binary node[:ruby][:gem]
+end

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


@@ -521,6 +542,7 @@ systemd_service "tile-ratelimit" do
   user "tile"
   group "adm"
   exec_start "/usr/local/bin/tile-ratelimit"
   user "tile"
   group "adm"
   exec_start "/usr/local/bin/tile-ratelimit"

+  nice 10

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


@@ -533,7 +555,7 @@ end
 
 service "tile-ratelimit" do
   action [:enable, :start]
 
 service "tile-ratelimit" do
   action [:enable, :start]

-  subscribes :restart, "file[/usr/local/bin/time-ratelimit]"
+  subscribes :restart, "file[/usr/local/bin/tile-ratelimit]"

   subscribes :restart, "systemd_service[tile-ratelimit]"
 end
 
   subscribes :restart, "systemd_service[tile-ratelimit]"
 end
 


@@ -552,7 +574,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
 


@@ -567,8 +589,9 @@ 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"
   exec_start "/usr/local/bin/expire-tiles"

+  nice 10

   standard_output "null"
   private_tmp true
   private_devices true
   standard_output "null"
   private_tmp true
   private_devices true


@@ -636,7 +659,7 @@ end
 
 systemd_timer "render-lowzoom" do
   description "Render low zoom tiles"
 
 systemd_timer "render-lowzoom" do
   description "Render low zoom tiles"

-  on_calendar "Sun *-*~07/1 01:00:00"
+  on_calendar "Fri *-*-* 23:00:00 UTC"

 end
 
 service "render-lowzoom.timer" do
 end
 
 service "render-lowzoom.timer" do


@@ -662,7 +685,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


@@ -681,6 +704,8 @@ munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 
 
 munin_plugin "replication_delay"
 

+package "ruby-webrick"
+

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