tilecache: block Wget UA

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 3b0355757750a8b6c9297822e4ae00f17cde9036..94fd04e937a6e768240b9dd438ea8b4ff63ce03a 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,38 +20,44 @@
 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 $#"
 }
 
 include_recipe "git"
 include_recipe "incron"
 
   :command => "/usr/local/bin/planetdump $#"
 }
 
 include_recipe "git"
 include_recipe "incron"
 

-package "gcc"
-package "make"
-package "autoconf"
-package "automake"
-package "libxml2-dev"
-package "libboost-dev"
-package "libboost-program-options-dev"
-package "libboost-date-time-dev"
-package "libboost-filesystem-dev"
-package "libboost-thread-dev"
-package "libboost-iostreams-dev"
-package "libosmpbf-dev"
-package "libprotobuf-dev"
-package "osmpbf-bin"
+package %w[
+  gcc
+  make
+  autoconf
+  automake
+  libxml2-dev
+  libboost-dev
+  libboost-program-options-dev
+  libboost-date-time-dev
+  libboost-filesystem-dev
+  libboost-thread-dev
+  libboost-iostreams-dev
+  libosmpbf-dev
+  libprotobuf-dev
+  osmpbf-bin
+  pbzip2
+  php-cli
+  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
 end
 
 git "/opt/planet-dump-ng" do
   action :sync

-  repository "git://github.com/zerebubuth/planet-dump-ng.git"
-  revision "changesets"
+  repository "https://github.com/zerebubuth/planet-dump-ng.git"
+  revision "v1.1.6"
+  depth 1

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


@@ -86,14 +92,22 @@ 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
+  recursive true

 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