]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/taginfo/recipes/default.rb
Removed unused config setting and m4 dependency in taginfo config.
[chef.git] / cookbooks / taginfo / recipes / default.rb
index 86ef9d44ebe726a3bd91a3ae93dc0b47c21b4b9b..dd9cdf83ecd236a07d9e09e8bc474e30f24bae67 100644 (file)
@@ -39,15 +39,16 @@ package "g++"
 package "sqlite3"
 package "osmosis"
 package "curl"
-package "m4"
 
-package "ruby#{node[:passenger][:ruby_version]}"
+ruby_version = node[:passenger][:ruby_version]
 
-gem_package "json"
-gem_package "sqlite3"
-gem_package "sinatra"
-gem_package "sinatra-r18n"
-gem_package "rack-contrib"
+package "ruby#{ruby_version}"
+
+%w(json sqlite3 sinatra sinatra-r18n rack-contrib).each do |gem|
+  gem_package gem do
+    gem_binary "gem#{ruby_version}"
+  end
+end
 
 apache_module "cache"
 apache_module "cache_disk"
@@ -137,7 +138,6 @@ node[:taginfo][:sites].each do |site|
     settings["sources"]["create"] = "db languages projects wiki"
     settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf"
     settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
-    settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats"
     settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
     settings["user_interface"]["key_page"]["show_tab_similar"] = true