X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d1ade9cc2fa9f44c3b9f8378d70f742bc9da4add..426929d413ee6b334ed1c5f3b5e46689055a641f:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 9013c33ae..27f560f3d 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -37,6 +37,7 @@ package "g++"
 package "sqlite3"
 package "osmosis"
 package "curl"
+package "m4"
 package "subversion"
 
 package "ruby"
@@ -47,6 +48,9 @@ gem_package "sinatra"
 gem_package "sinatra-r18n"
 gem_package "rack-contrib"
 
+apache_module "cache"
+apache_module "disk_cache"
+
 template "/etc/cron.d/taginfo" do
   source "cron.erb"
   owner "root"
@@ -60,17 +64,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]
 
@@ -89,7 +91,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/osmium" do
     action :sync
     repository "git://github.com/joto/osmium.git"
-    revision "master"
+    revision "osmorg-taginfo-live"
     user "taginfo"
     group "taginfo"
   end
@@ -97,7 +99,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/taginfo" do
     action :sync
     repository "git://github.com/joto/taginfo.git"
-    revision "master"
+    revision "osmorg-taginfo-live"
     user "taginfo"
     group "taginfo"
   end
@@ -106,6 +108,7 @@ node[:taginfo][:sites].each do |site|
 
   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["logging"]["directory"] = "/var/log/taginfo/#{name}"
@@ -116,6 +119,7 @@ node[:taginfo][:sites].each do |site|
   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"
 
   file "#{directory}/taginfo-config.json" do
     owner "taginfo"
@@ -231,7 +235,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