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

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 6d7b83a08c56e7f724a979e8405899a8a2587379..6cc509c62c5bdb979d5fb8e5a9ab421dfc0d43f6 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -17,15 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-node.default[:incron][:planetdump] = {
-  :user => "root",
-  :path => "/store/backup",
-  :events => %w[IN_CREATE IN_MOVED_TO],
-  :command => "/bin/systemctl start planetdump@$#"
-}
-
+include_recipe "accounts"

 include_recipe "git"
 include_recipe "git"

-include_recipe "incron"

 
 package %w[
   gcc
 
 package %w[
   gcc


@@ -50,6 +43,7 @@ package %w[
   mktorrent
   xmlstarlet
   libxml2-utils
   mktorrent
   xmlstarlet
   libxml2-utils

+  inotify-tools

 ]
 
 directory "/opt/planet-dump-ng" do
 ]
 
 directory "/opt/planet-dump-ng" do


@@ -61,7 +55,7 @@ end
 git "/opt/planet-dump-ng" do
   action :sync
   repository "https://github.com/zerebubuth/planet-dump-ng.git"
 git "/opt/planet-dump-ng" do
   action :sync
   repository "https://github.com/zerebubuth/planet-dump-ng.git"

-  revision "v1.2.5"
+  revision "v1.2.7"

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


@@ -95,13 +89,13 @@ execute "/opt/planet-dump-ng/Makefile" do
 end
 
 directory "/store/planetdump" do
 end
 
 directory "/store/planetdump" do

-  owner "www-data"
-  group "www-data"
+  owner "planet"
+  group "planet"

   mode "755"
   recursive true
 end
 
   mode "755"
   recursive true
 end
 

-%w[planetdump planet-mirror-redirect-update].each do |program|
+%w[planetdump planetdump-trigger planet-mirror-redirect-update].each do |program|

   template "/usr/local/bin/#{program}" do
     source "#{program}.erb"
     owner "root"
   template "/usr/local/bin/#{program}" do
     source "#{program}.erb"
     owner "root"


@@ -112,18 +106,47 @@ end
 
 systemd_service "planetdump@" do
   description "Planet dump for %i"
 
 systemd_service "planetdump@" do
   description "Planet dump for %i"

-  user "www-data"
+  user "planet"

   exec_start "/usr/local/bin/planetdump %i"
   memory_max "64G"
   exec_start "/usr/local/bin/planetdump %i"
   memory_max "64G"

-  private_tmp true
-  protect_system "full"
-  protect_home true
-  read_write_paths "/var/log/exim4"
+  sandbox true
+  read_write_paths [
+    "/store/planetdump",
+    "/store/planet/pbf",
+    "/store/planet/planet",
+    "/var/log/exim4",
+    "/var/spool/exim4"
+  ]
+end
+
+systemd_service "planetdump-trigger" do
+  description "Planet dump trigger"
+  user "root"
+  exec_start "/usr/local/bin/planetdump-trigger"
+  sandbox true
+  restrict_address_families "AF_UNIX"
+end
+
+service "planetdump-trigger" do
+  action [:enable, :start]
+  subscribes :restart, "template[/usr/local/bin/planetdump-trigger]"
+end
+
+systemd_service "planet-dump-mirror" do
+  description "Update planet dump mirrors"
+  exec_start "/usr/local/bin/planet-mirror-redirect-update"
+  user "planet"
+  sandbox :enable_network => true
+  memory_deny_write_execute false
+  read_write_paths "/store/planet/.htaccess"
+end
+
+systemd_timer "planet-dump-mirror" do
+  description "Update planet dump mirrors"
+  on_boot_sec "10min"
+  on_unit_inactive_sec "10min"

 end
 
 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"
+service "planet-dump-mirror.timer" do
+  action [:enable, :start]

 end
 end