Merge remote-tracking branch 'github/pull/447'

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 1d1d170bf433342ff44992346838657493b66270..82e6f1cab85eaf3571728de3dbef93f0dc68380e 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -21,7 +21,7 @@ node.default[:incron][:planetdump] = {
   :user => "root",
   :path => "/store/backup",
   :events => %w[IN_CREATE IN_MOVED_TO],
   :user => "root",
   :path => "/store/backup",
   :events => %w[IN_CREATE IN_MOVED_TO],

-  :command => "/usr/bin/systemctl start planetdump@$#"
+  :command => "/bin/systemctl start planetdump@$#"

 }
 
 include_recipe "git"
 }
 
 include_recipe "git"


@@ -47,18 +47,21 @@ package %w[
   pbzip2
   php-cli
   php-curl
   pbzip2
   php-cli
   php-curl

+  mktorrent
+  xmlstarlet
+  libxml2-utils

 ]
 
 directory "/opt/planet-dump-ng" do
   owner "root"
   group "root"
 ]
 
 directory "/opt/planet-dump-ng" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 git "/opt/planet-dump-ng" do
   action :sync
   repository "https://github.com/zerebubuth/planet-dump-ng.git"
 end
 
 git "/opt/planet-dump-ng" do
   action :sync
   repository "https://github.com/zerebubuth/planet-dump-ng.git"

-  revision "v1.1.8"
+  revision "v1.2.0"

   depth 1
   user "root"
   group "root"
   depth 1
   user "root"
   group "root"


@@ -94,7 +97,7 @@ end
 directory "/store/planetdump" do
   owner "www-data"
   group "www-data"
 directory "/store/planetdump" do
   owner "www-data"
   group "www-data"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
   recursive true
 end
 


@@ -103,7 +106,7 @@ end
     source "#{program}.erb"
     owner "root"
     group "root"
     source "#{program}.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

   end
 end
 
   end
 end