Update libosmium and osmium-tool on taginfo server.

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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 370b4b2b2e35060e863db06d43462ac8b7931909..39521e3ea008bcaa36b742e27663c3c23d14815e 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -39,6 +39,7 @@ package "g++"
 package "sqlite3"
 package "osmosis"
 package "curl"
+package "pbzip2"
 
 ruby_version = node[:passenger][:ruby_version]
 
@@ -58,13 +59,13 @@ template "/etc/cron.d/taginfo" do
   source "cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/var/log/taginfo" do
   owner "taginfo"
   group "taginfo"
-  mode 0755
+  mode 0o755
 end
 
 file "/etc/logrotate.d/taginfo" do
@@ -75,7 +76,7 @@ template "/etc/sudoers.d/taginfo" do
   source "sudoers.erb"
   owner "root"
   group "root"
-  mode 0440
+  mode 0o440
 end
 
 node[:taginfo][:sites].each do |site|
@@ -89,19 +90,19 @@ node[:taginfo][:sites].each do |site|
   directory "/var/log/taginfo/#{name}" do
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
   end
 
   directory directory do
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
   end
 
   git "#{directory}/libosmium" do
     action :sync
     repository "git://github.com/osmcode/libosmium.git"
-    revision "v2.5.3"
+    revision "v2.9.0"
     user "taginfo"
     group "taginfo"
   end
@@ -109,7 +110,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/osmium-tool" do
     action :sync
     repository "git://github.com/osmcode/osmium-tool.git"
-    revision "v1.3.0"
+    revision "v1.4.0"
     user "taginfo"
     group "taginfo"
   end
@@ -140,7 +141,6 @@ node[:taginfo][:sites].each do |site|
     settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
     settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
-    settings["level0"]["overpass_url_prefix"] = "http://overpass-api.de/api/interpreter?"
 
     JSON.pretty_generate(settings)
   end
@@ -148,7 +148,7 @@ node[:taginfo][:sites].each do |site|
   file "#{directory}/taginfo-config.json" do
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
     content settings
     notifies :restart, "service[apache2]"
   end
@@ -169,8 +169,6 @@ node[:taginfo][:sites].each do |site|
     group "taginfo"
     mode "0755"
     action :create
-    subscribes :create, "git[#{directory}/libosmium]"
-    subscribes :create, "git[#{directory}/osmium-tool]"
   end
 
   execute "compile-osmium" do
@@ -181,14 +179,13 @@ node[:taginfo][:sites].each do |site|
     group "taginfo"
     subscribes :run, "git[#{directory}/libosmium]"
     subscribes :run, "git[#{directory}/osmium-tool]"
-    subscribes :run, "directory[#{directory}/osmium-tool/build]"
   end
 
   %w(taginfo/web/tmp bin data data/old download sources planet planet/log planet/replication).each do |dir|
     directory "#{directory}/#{dir}" do
       owner "taginfo"
       group "taginfo"
-      mode 0755
+      mode 0o755
     end
   end
 
@@ -197,27 +194,27 @@ node[:taginfo][:sites].each do |site|
     source "http://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   template "#{directory}/planet/replication/configuration.txt" do
     source "configuration.txt.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   file "#{directory}/planet/replication/download.lock" do
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
   end
 
   template "#{directory}/bin/update-planet" do
     source "update-planet.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :directory => directory
   end
 
@@ -225,7 +222,7 @@ node[:taginfo][:sites].each do |site|
     source "update-taginfo.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :directory => directory
   end
 
@@ -233,7 +230,7 @@ node[:taginfo][:sites].each do |site|
     source "update.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
     variables :name => name, :directory => directory
   end