Remove duplicate resource

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index a9952b9f9d41e4d5f2c7f7d68814ab4a4e6249c1..2358394e120c319763743dd07469a3b34e9e3b4d 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -172,36 +172,40 @@ tilerenders.each do |render|
   end
 end
 
-template "/etc/cron.d/tilecache" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-
-directory "/src/tilecache"
+directory "/srv/tilecache" do
   owner "root"
   group "root"
   mode 0o755
 end
 
-directory "/src/tilecache/data"
+directory "/srv/tilecache/data" do
   owner "www-data"
   group "www-data"
   mode 0o755
 end
 
-file "/src/tilecache/tilecache-curl-time.txt" do
+cookbook_file "/srv/tilecache/tilecache-curl-time.txt" do
   source "tilecache-curl-time.txt"
   owner "root"
   group "root"
   mode 0o755
 end
 
-template "/src/tilecache/tilecache-curl-time" do
+template "/srv/tilecache/tilecache-curl-time" do
   source "tilecache-curl-time.erb"
   owner "root"
   group "root"
   mode 0o755
   variables :caches => tilecaches, :renders => tilerenders
 end
+
+template "/srv/tilecache/tilecache-curl-time-cleanup" do
+  source "tilecache-curl-time-cleanup.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+ohai_plugin "tilecache" do
+  template "ohai.rb.erb"
+end