X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9504c62303d2a0f8c831b183f27b7cb072faccab..8fc909af185e93f6014d3edc9fe01be643c239c1:/cookbooks/planet/recipes/dump.rb diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb index 94fd04e93..5e236c6bb 100644 --- a/cookbooks/planet/recipes/dump.rb +++ b/cookbooks/planet/recipes/dump.rb @@ -18,10 +18,10 @@ # node.default[:incron][:planetdump] = { - :user => "www-data", + :user => "root", :path => "/store/backup", :events => %w[IN_CREATE IN_MOVED_TO], - :command => "/usr/local/bin/planetdump $#" + :command => "/bin/systemctl start planetdump@$#" } include_recipe "git" @@ -29,9 +29,11 @@ include_recipe "incron" package %w[ gcc + g++ make autoconf automake + pkg-config libxml2-dev libboost-dev libboost-program-options-dev @@ -45,18 +47,21 @@ package %w[ pbzip2 php-cli php-curl + mktorrent + xmlstarlet + libxml2-utils ] 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" - revision "v1.1.6" + revision "v1.2.4" depth 1 user "root" group "root" @@ -92,7 +97,7 @@ end directory "/store/planetdump" do owner "www-data" group "www-data" - mode 0o755 + mode "755" recursive true end @@ -101,13 +106,24 @@ end source "#{program}.erb" owner "root" group "root" - mode 0o755 + mode "755" 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" + private_tmp true + protect_system "full" + protect_home true + read_write_paths "/var/log/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