Use default sandbox for planetdump

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 94fd04e937a6e768240b9dd438ea8b4ff63ce03a..d565750119e8c6d2b24fed089e499d327b671bb4 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -18,10 +18,10 @@
 #
 
 node.default[:incron][:planetdump] = {
 #
 
 node.default[:incron][:planetdump] = {

-  :user => "www-data",
+  :user => "root",

   :path => "/store/backup",
   :events => %w[IN_CREATE IN_MOVED_TO],
   :path => "/store/backup",
   :events => %w[IN_CREATE IN_MOVED_TO],

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

 }
 
 include_recipe "git"
 }
 
 include_recipe "git"


@@ -29,9 +29,11 @@ include_recipe "incron"
 
 package %w[
   gcc
 
 package %w[
   gcc

+  g++

   make
   autoconf
   automake
   make
   autoconf
   automake

+  pkg-config

   libxml2-dev
   libboost-dev
   libboost-program-options-dev
   libxml2-dev
   libboost-dev
   libboost-program-options-dev


@@ -45,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.6"
+  revision "v1.2.6"

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


@@ -92,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
 


@@ -101,13 +106,28 @@ end
     source "#{program}.erb"
     owner "root"
     group "root"
     source "#{program}.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

   end
 end
 
   end
 end
 

-template "/etc/cron.d/planet-dump-mirror" do
-  source "planet-dump-mirror-cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+systemd_service "planetdump@" do
+  description "Planet dump for %i"
+  user "www-data"
+  exec_start "/usr/local/bin/planetdump %i"
+  memory_max "64G"
+  sandbox true
+  read_write_paths [
+    "/store/planetdump",
+    "/store/planet/pbf",
+    "/store/planet/planet",
+    "/var/log/exim4",
+    "/var/spool/exim4"
+  ]
+end
+
+cron_d "planet-dump-mirror" do
+  minute "*/10"
+  user "www-data"
+  command "/usr/local/bin/planet-mirror-redirect-update"
+  mailto "horntail-www-data-cron@firefishy.com"

 end
 end