Merge remote-tracking branch 'github/pull/79'

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 5346795f97c37488daf87781806c555f8334ad6f..ea32ef5af3032b213b50bd92c0351830e0bbf27b 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -43,19 +43,19 @@ 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"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 git "/opt/planet-dump-ng" do
   action :sync
   repository "git://github.com/zerebubuth/planet-dump-ng.git"
-  revision "v1.1.1"
+  revision "v1.1.4"
   user "root"
   group "root"
 end
@@ -90,7 +90,7 @@ end
 directory "/store/planetdump" do
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
 end
 
 ["planetdump", "planet-mirror-redirect-update", "apache-latest-planet-filename"].each do |program|
@@ -98,6 +98,13 @@ end
     source "#{program}.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 end
+
+template "/etc/cron.d/planet-dump-mirror" do
+  source "planet-dump-mirror-cron.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end