Update piwik to 3.1.0

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 02f3ae350654ab5222fcba27b80e13f5856084d4..0eb5cef0d43e857ddef985d7e3e64ba2f6347187 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",
 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 $#"
 }
 


@@ -39,21 +39,23 @@ package "libboost-filesystem-dev"
 package "libboost-thread-dev"
 package "libboost-iostreams-dev"
 package "libosmpbf-dev"
 package "libboost-thread-dev"
 package "libboost-iostreams-dev"
 package "libosmpbf-dev"

-package "libleveldb-dev"
-package "libsnappy-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 "master"
+  revision "v1.1.4"

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


@@ -69,7 +71,7 @@ end
 
 execute "/opt/planet-dump-ng/configure" do
   action :nothing
 
 execute "/opt/planet-dump-ng/configure" do
   action :nothing

-  command "./configure --with-leveldb=/usr"
+  command "./configure"

   cwd "/opt/planet-dump-ng"
   user "root"
   group "root"
   cwd "/opt/planet-dump-ng"
   user "root"
   group "root"


@@ -88,12 +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
+
+["planetdump", "planet-mirror-redirect-update"].each do |program|
+  template "/usr/local/bin/#{program}" do
+    source "#{program}.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+  end

 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"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o644

 end
 end