Switch taginfo to expire logs manually and drop logrotate

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

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 9013c33ae2db0ec22194e3ec9717dd04f01e7cd8..a0a4091961cc86764a781338cdca87b4025b79b4 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -47,6 +47,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,11 +63,8 @@ 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|
@@ -89,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
@@ -97,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
@@ -231,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