Add extra fonts needed for v2.13.0 of the stylesheet

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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 31592b9babd6ab4380a6c362981a152824165eb4..a0a4091961cc86764a781338cdca87b4025b79b4 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -35,8 +35,9 @@ package "make"
 package "g++"
 
 package "sqlite3"
-
 package "osmosis"
+package "curl"
+package "subversion"
 
 package "ruby"
 package "rubygems"
@@ -46,17 +47,24 @@ 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"
+  group "root"
+  mode 0644
+end
+
 directory "/var/log/taginfo" do
   owner "taginfo"
   group "taginfo"
   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|
@@ -66,7 +74,7 @@ node[:taginfo][:sites].each do |site|
   icon = site[:icon]
   contact = site[:contact]
 
-  directory "/var/log/taginfo/#{site}" do
+  directory "/var/log/taginfo/#{name}" do
     owner "taginfo"
     group "taginfo"
     mode 0755
@@ -81,7 +89,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
@@ -89,7 +97,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
@@ -100,10 +108,13 @@ node[:taginfo][:sites].each do |site|
   settings["instance"]["description"] = description
   settings["instance"]["icon"] = "/img/logo/#{icon}.png"
   settings["instance"]["contact"] = contact
-  settings["logging"]["directory"] = "/var/log/taginfo/#{site}"
+  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"
 
   file "#{directory}/taginfo-config.json" do
@@ -136,6 +147,12 @@ node[:taginfo][:sites].each do |site|
     mode 0755
   end
 
+  directory "#{directory}/data/old" do
+    owner "taginfo"
+    group "taginfo"
+    mode 0755
+  end
+
   directory "#{directory}/download" do
     owner "taginfo"
     group "taginfo"
@@ -214,7 +231,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