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 bc0214da59e992fde0d5ea447a292946906796c2..ea32ef5af3032b213b50bd92c0351830e0bbf27b 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 $#"
 }
 
@@ -42,16 +42,20 @@ package "libosmpbf-dev"
 package "libprotobuf-dev"
 package "osmpbf-bin"
 
+# Add planet-mirror-redirect-update dependencies
+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 "master"
+  revision "v1.1.4"
   user "root"
   group "root"
 end
@@ -86,12 +90,21 @@ 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|
+  template "/usr/local/bin/#{program}" do
+    source "#{program}.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+  end
 end
 
-template "/usr/local/bin/planetdump" do
-  source "planetdump.erb"
+template "/etc/cron.d/planet-dump-mirror" do
+  source "planet-dump-mirror-cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o644
 end