Use chef 14 to run tests

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 3b0355757750a8b6c9297822e4ae00f17cde9036..0b46a2c7bcdc65fc21eaea011bbde438d88c2e5a 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: planet
+# Cookbook:: planet

 # Recipe:: dump
 #
 # Recipe:: dump
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -20,7 +20,7 @@
 node.default[:incron][:planetdump] = {
   :user => "www-data",
   :path => "/store/backup",
 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 $#"
 }
 
   :command => "/usr/local/bin/planetdump $#"
 }
 


@@ -42,16 +42,20 @@ package "libosmpbf-dev"
 package "libprotobuf-dev"
 package "osmpbf-bin"
 
 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"
 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"
 end
 
 git "/opt/planet-dump-ng" do
   action :sync
   repository "git://github.com/zerebubuth/planet-dump-ng.git"

-  revision "changesets"
+  revision "v1.1.6"

   user "root"
   group "root"
 end
   user "root"
   group "root"
 end


@@ -86,14 +90,21 @@ end
 directory "/store/planetdump" do
   owner "www-data"
   group "www-data"
 directory "/store/planetdump" do
   owner "www-data"
   group "www-data"

-  mode 0755
+  mode 0o755

 end
 
 end
 

-["planetdump", "planet-mirror-redirect-update", "apache-latest-planet-filename"].each do |program|
+%w[planetdump planet-mirror-redirect-update].each do |program|

   template "/usr/local/bin/#{program}" do
     source "#{program}.erb"
     owner "root"
     group "root"
   template "/usr/local/bin/#{program}" do
     source "#{program}.erb"
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755

   end
 end
   end
 end

+
+template "/etc/cron.d/planet-dump-mirror" do
+  source "planet-dump-mirror-cron.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end