X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fc644b32403b63672bd1de6b9676efec559e5961..8219373b7c58e807957f47bafa27b503e2c2826d:/cookbooks/tile/recipes/default.rb diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index fe3b6c862..22a642675 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -422,7 +422,7 @@ end file node[:tile][:node_file] do owner "tile" group "www-data" - mode 0o640 + mode 0o660 end directory "/var/log/tile" do @@ -433,30 +433,20 @@ end package %w[ osm2pgsql - osmosis -] - -package %w[ ruby - ruby-dev + osmium-tool + pyosmium + python-pyproj ] -package %w[ - libproj-dev - libxml2-dev -] - -gem_package "proj4rb" -gem_package "libxml-ruby" - -remote_directory "/usr/local/lib/site_ruby" do - source "ruby" +remote_directory "/usr/local/bin" do + source "bin" owner "root" group "root" mode 0o755 files_owner "root" files_group "root" - files_mode 0o644 + files_mode 0o755 end template "/usr/local/bin/expire-tiles" do @@ -478,13 +468,6 @@ directory "/var/lib/replicate/expire-queue" do mode 0o775 end -template "/var/lib/replicate/configuration.txt" do - source "replicate.configuration.erb" - owner "tile" - group "tile" - mode 0o644 -end - template "/usr/local/bin/replicate" do source "replicate.erb" owner "root" @@ -589,6 +572,4 @@ munin_plugin "renderd_queue_time" munin_plugin "renderd_zoom" munin_plugin "renderd_zoom_time" -munin_plugin "replication_delay" do - conf "munin.erb" -end +munin_plugin "replication_delay"