X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2d96a0d42830fa190e987a31d0d6b766127c5ba5..1db8f6a1fdf56f74cc11d9f7bc22d2f762801013:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 2faafad1c..f1d5bb869 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -37,16 +37,21 @@ package "g++"
 package "sqlite3"
 package "osmosis"
 package "curl"
+package "m4"
 package "subversion"
 
-package "ruby"
-package "rubygems"
+package "ruby#{node[:passenger][:ruby_version]}"
+package "rubygems#{node[:passenger][:ruby_version]}"
 gem_package "json"
 gem_package "sqlite3"
 gem_package "sinatra"
 gem_package "sinatra-r18n"
 gem_package "rack-contrib"
 
+apache_module "cache"
+apache_module "cache_disk"
+apache_module "headers"
+
 template "/etc/cron.d/taginfo" do
   source "cron.erb"
   owner "root"
@@ -60,17 +65,15 @@ directory "/var/log/taginfo" do
   mode 0755
 end
 
-template "/etc/logrotate.d/taginfo" do
-  source "logrotate.erb"
-  owner "root"
-  group "root"
-  mode 0644
+file "/etc/logrotate.d/taginfo" do
+  action :delete
 end
 
 node[:taginfo][:sites].each do |site|
   name = site[:name]
   directory = site[:directory] || "/srv/#{name}"
   description = site[:description]
+  about = site[:about]
   icon = site[:icon]
   contact = site[:contact]
 
@@ -102,26 +105,33 @@ node[:taginfo][:sites].each do |site|
     group "taginfo"
   end
 
-  settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
+  settings = Chef::DelayedEvaluator.new do
+    settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
 
-  settings["instance"]["url"] = "http://#{name}/"
-  settings["instance"]["description"] = description
-  settings["instance"]["icon"] = "/img/logo/#{icon}.png"
-  settings["instance"]["contact"] = contact
-  settings["logging"]["directory"] = "/var/log/taginfo/#{name}"
-  settings["opensearch"]["shortname"] = "Taginfo"
-  settings["opensearch"]["contact"] = "webmaster@openstreetmap.org"
-  settings["sources"]["download"] = ""
-  settings["sources"]["create"] = "db languages josm potlatch wiki"
-  settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf"
-  settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats"
-  settings["tagstats"]["cxxflags"] = "-I../../osmium/include"
+    settings["instance"]["url"] = "http://#{name}/"
+    settings["instance"]["description"] = description
+    settings["instance"]["about"] = about
+    settings["instance"]["icon"] = "/img/logo/#{icon}.png"
+    settings["instance"]["contact"] = contact
+    settings["instance"]["access_control_allow_origin"] = ""
+    settings["logging"]["directory"] = "/var/log/taginfo/#{name}"
+    settings["opensearch"]["shortname"] = "Taginfo"
+    settings["opensearch"]["contact"] = "webmaster@openstreetmap.org"
+    settings["sources"]["download"] = "josm"
+    settings["sources"]["create"] = "db languages potlatch projects wiki"
+    settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf"
+    settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats"
+    settings["tagstats"]["cxxflags"] = "-I../../osmium/include"
+    settings["tagstats"]["geodistribution"] = "MmapAnon"
+
+    JSON.pretty_generate(settings)
+  end
 
   file "#{directory}/taginfo-config.json" do
     owner "taginfo"
     group "taginfo"
     mode 0644
-    content JSON.pretty_generate(settings)
+    content settings
   end
 
   execute "#{directory}/taginfo/tagstats/Makefile" do
@@ -231,7 +241,7 @@ node[:taginfo][:sites].each do |site|
     owner "taginfo"
     group "taginfo"
     mode 0755
-    variables :directory => directory
+    variables :name => name, :directory => directory
   end
 
   apache_site name do