X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/efa0fec56f48f69c108a0c314cf45842deb062c3..8f86a03526fe64640e48ef21b2f8aad8066ed5a7:/cookbooks/planet/recipes/dump.rb

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 30d39359c..f7a143181 100644
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -17,15 +17,7 @@
 # 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 "git"
-include_recipe "incron"
 
 package %w[
   gcc
@@ -50,6 +42,7 @@ package %w[
   mktorrent
   xmlstarlet
   libxml2-utils
+  inotify-tools
 ]
 
 directory "/opt/planet-dump-ng" do
@@ -61,7 +54,7 @@ end
 git "/opt/planet-dump-ng" do
   action :sync
   repository "https://github.com/zerebubuth/planet-dump-ng.git"
-  revision "v1.2.6"
+  revision "v1.2.7"
   depth 1
   user "root"
   group "root"
@@ -101,7 +94,7 @@ directory "/store/planetdump" do
   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"
@@ -125,11 +118,25 @@ systemd_service "planetdump@" do
   ]
 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 "www-data"
   sandbox :enable_network => true
+  memory_deny_write_execute false
   read_write_paths "/store/planet/.htaccess"
 end