Switch tile servers to use osmium for fetching diffs

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9128b4e2b8af0c7a725d5495f30e519e55aa7f3e..f87bac614f2abce72b0dd00bf4f04265202669a5 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -358,9 +358,10 @@ node[:tile][:styles].each do |name, details|
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first
+postgis_version = node[:tile][:database][:postgis]
 
 package "postgis"
-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
 postgresql_user "jburgess" do
   cluster node[:tile][:database][:cluster]
@@ -421,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
@@ -432,30 +433,19 @@ end
 
 package %w[
   osm2pgsql
-  osmosis
-]
-
-package %w[
   ruby
-  ruby-dev
+  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
@@ -477,13 +467,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"