Teach munin to use internal addresses for Amsterdam machines

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 63092565adc49fa3c2ed68645f24e403ad64f796..e719e894a275cfd32c7c01404085730334378650 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -8,7 +8,7 @@
 # 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,
@@ -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,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.0.0"
+  revision "v1.1.6"
   user "root"
   group "root"
 end
@@ -90,14 +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|
+["planetdump", "planet-mirror-redirect-update"].each do |program|
   template "/usr/local/bin/#{program}" do
     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