Configure database for logical replication

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 7d056163fa234e057a2b34cf99fab87a1073de6b..7363e410cd3fe945b20463defa6917330d17ab89 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"
 


@@ -60,13 +61,13 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
   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"


@@ -96,14 +97,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 +113,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 +150,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 +172,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 +200,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 +255,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]"


@@ -279,7 +280,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 +291,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 +303,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 +332,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


@@ -425,20 +426,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 +454,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,14 +534,14 @@ 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
 end
 
 systemd_service "render-lowzoom" do


@@ -564,10 +565,6 @@ service "render-lowzoom.timer" do
   action [:enable, :start]
 end
 
   action [:enable, :start]
 end
 

-file "/etc/cron.d/render-lowzoom" do
-  action :delete
-end
-

 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"
 
 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"
 


@@ -575,19 +572,22 @@ 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
 

-template "/etc/cron.d/cleanup-tiles" do
-  source "cleanup-tiles.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  variables :directories => tile_directories
+tile_directories.each do |directory|
+  label = directory.gsub("/", "-")
+
+  cron_d "cleanup-tiles#{label}" do
+    minute "0"
+    user "www-data"
+    command "ionice -c 3 /usr/local/bin/cleanup-tiles #{directory}"
+    mailto "admins@openstreetmap.org"
+  end

 end
 
 munin_plugin "mod_tile_fresh"
 end
 
 munin_plugin "mod_tile_fresh"


@@ -602,3 +602,11 @@ munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "replication_delay"

+
+prometheus_collector "modtile" do
+  interval "1m"
+end
+
+prometheus_collector "renderd" do
+  interval "1m"
+end