Enable caching for certain taginfo responses

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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 628f1f5aca9f2d7cae2f5728bc9a4b02a533dee5..e0b6d34c24843be9cf089a93fb3f83c00fe706b1 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 "g++"
 
 package "sqlite3"

-

 package "osmosis"
 package "osmosis"

+package "curl"
+package "subversion"

 
 package "ruby"
 package "rubygems"
 
 package "ruby"
 package "rubygems"


@@ -46,6 +47,16 @@ gem_package "sinatra"
 gem_package "sinatra-r18n"
 gem_package "rack-contrib"
 
 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"
 directory "/var/log/taginfo" do
   owner "taginfo"
   group "taginfo"


@@ -66,7 +77,7 @@ node[:taginfo][:sites].each do |site|
   icon = site[:icon]
   contact = site[:contact]
 
   icon = site[:icon]
   contact = site[:contact]
 

-  directory "/var/log/taginfo/#{site}" do
+  directory "/var/log/taginfo/#{name}" do

     owner "taginfo"
     group "taginfo"
     mode 0755
     owner "taginfo"
     group "taginfo"
     mode 0755


@@ -81,7 +92,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/osmium" do
     action :sync
     repository "git://github.com/joto/osmium.git"
   git "#{directory}/osmium" do
     action :sync
     repository "git://github.com/joto/osmium.git"

-    revision "master"
+    revision "osmorg-taginfo-live"

     user "taginfo"
     group "taginfo"
   end
     user "taginfo"
     group "taginfo"
   end


@@ -89,7 +100,7 @@ node[:taginfo][:sites].each do |site|
   git "#{directory}/taginfo" do
     action :sync
     repository "git://github.com/joto/taginfo.git"
   git "#{directory}/taginfo" do
     action :sync
     repository "git://github.com/joto/taginfo.git"

-    revision "master"
+    revision "osmorg-taginfo-live"

     user "taginfo"
     group "taginfo"
   end
     user "taginfo"
     group "taginfo"
   end


@@ -100,9 +111,11 @@ node[:taginfo][:sites].each do |site|
   settings["instance"]["description"] = description
   settings["instance"]["icon"] = "/img/logo/#{icon}.png"
   settings["instance"]["contact"] = contact
   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["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["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf"
   settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats"
   settings["tagstats"]["cxxflags"] = "-I../../osmium/include"


@@ -137,6 +150,12 @@ node[:taginfo][:sites].each do |site|
     mode 0755
   end
 
     mode 0755
   end
 

+  directory "#{directory}/data/old" do
+    owner "taginfo"
+    group "taginfo"
+    mode 0755
+  end
+

   directory "#{directory}/download" do
     owner "taginfo"
     group "taginfo"
   directory "#{directory}/download" do
     owner "taginfo"
     group "taginfo"