X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6cce603b75b8ea9dc9a234f49427583abc9c0a1a..aeaa46f3071de018b5c5e0f5678cb5b4082e3ddc:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index e9a569bd1..5a7a33af8 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -60,13 +60,13 @@ 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" - mode 0o755 + mode "755" end package "renderd" @@ -96,14 +96,14 @@ end 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" - mode 0o644 + mode "644" notifies :reload, "service[apache2]" notifies :restart, "service[renderd]" end @@ -112,7 +112,7 @@ remote_directory "/srv/tile.openstreetmap.org/html" do source "html" owner "tile" group "tile" - mode 0o755 + mode "755" files_owner "tile" files_group "tile" files_mode 0o644 @@ -122,7 +122,7 @@ template "/srv/tile.openstreetmap.org/html/index.html" do source "index.html.erb" owner "tile" group "tile" - mode 0o644 + mode "644" end package %w[ @@ -149,21 +149,21 @@ package %w[ 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" - mode 0o755 + mode "755" 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 @@ -171,20 +171,20 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do 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" - mode 0o755 + mode "755" end directory "/srv/tile.openstreetmap.org/data" do owner "tile" group "tile" - mode 0o755 + mode "755" end package "mapnik-utils" @@ -199,7 +199,7 @@ node[:tile][:data].each_value do |data| directory directory do owner "tile" group "tile" - mode 0o755 + mode "755" end else directory = "/srv/tile.openstreetmap.org/data" @@ -254,7 +254,7 @@ node[:tile][:data].each_value do |data| source url owner "tile" group "tile" - mode 0o644 + mode "644" backup false notifies :run, "execute[#{file}]", :immediately notifies :restart, "service[renderd]" @@ -279,7 +279,7 @@ end directory "/srv/tile.openstreetmap.org/styles" do owner "tile" group "tile" - mode 0o755 + mode "755" end node[:tile][:styles].each do |name, details| @@ -290,7 +290,7 @@ node[:tile][:styles].each do |name, details| source "update-lowzoom.erb" owner "root" group "root" - mode 0o755 + mode "755" variables :style => name end @@ -302,21 +302,21 @@ node[:tile][:styles].each do |name, details| 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" - 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" - mode 0o755 + mode "755" end link "#{tile_directory}/#{zoom}" do @@ -331,7 +331,7 @@ node[:tile][:styles].each do |name, details| action :create_if_missing owner "tile" group "tile" - mode 0o444 + mode "444" end git style_directory do @@ -425,20 +425,20 @@ end 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" - mode 0o660 + mode "660" end directory "/var/log/tile" do owner "tile" group "tile" - mode 0o755 + mode "755" end package %w[ @@ -453,7 +453,7 @@ remote_directory "/usr/local/bin" do source "bin" owner "root" group "root" - mode 0o755 + mode "755" files_owner "root" files_group "root" files_mode 0o755 @@ -463,26 +463,26 @@ 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" - mode 0o755 + mode "755" 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" - mode 0o755 + mode "755" variables :postgresql_version => postgresql_version.to_f end @@ -533,14 +533,14 @@ template "/etc/logrotate.d/replicate" do 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" - mode 0o755 + mode "755" end systemd_service "render-lowzoom" do @@ -571,7 +571,7 @@ template "/usr/local/bin/cleanup-tiles" do source "cleanup-tiles.erb" owner "root" group "root" - mode 0o755 + mode "755" end tile_directories = node[:tile][:styles].collect do |_, style|