Use file resource to remove old planet cron file

[chef.git] / cookbooks / planet / recipes / dump.rb

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 63092565adc49fa3c2ed68645f24e403ad64f796..452e07d479e1baf5ed8a4294efe9b7524df88990 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -20,7 +20,7 @@
 node.default[:incron][:planetdump] = {
   :user => "www-data",
   :path => "/store/backup",
-  :events => [ "IN_CREATE", "IN_MOVED_TO" ],
+  :events => %w(IN_CREATE IN_MOVED_TO),
   :command => "/usr/local/bin/planetdump $#"
 }
 
@@ -43,8 +43,8 @@ package "libprotobuf-dev"
 package "osmpbf-bin"
 
 # Add planet-mirror-redirect-update dependencies
-package "php5-cli"
-package "php5-curl"
+package "php-cli"
+package "php-curl"
 
 directory "/opt/planet-dump-ng" do
   owner "root"
@@ -55,7 +55,7 @@ end
 git "/opt/planet-dump-ng" do
   action :sync
   repository "git://github.com/zerebubuth/planet-dump-ng.git"
-  revision "v1.0.0"
+  revision "v1.1.4"
   user "root"
   group "root"
 end
@@ -101,3 +101,10 @@ end
     mode 0755
   end
 end
+
+template "/etc/cron.d/planet-dump-mirror" do
+  source "planet-dump-mirror-cron.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end