X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/af9b4252a2676e0910e8806518e9072202781d07..d16cf73f5107a14ef59b54f680968275c1341649:/cookbooks/planet/recipes/dump.rb diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb index 452e07d47..24c98d9b7 100644 --- a/cookbooks/planet/recipes/dump.rb +++ b/cookbooks/planet/recipes/dump.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: planet +# Cookbook:: planet # Recipe:: dump # -# Copyright 2013, OpenStreetMap Foundation +# Copyright:: 2013, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,45 +17,45 @@ # limitations under the License. # -node.default[:incron][:planetdump] = { - :user => "www-data", - :path => "/store/backup", - :events => %w(IN_CREATE IN_MOVED_TO), - :command => "/usr/local/bin/planetdump $#" -} - include_recipe "git" -include_recipe "incron" - -package "gcc" -package "make" -package "autoconf" -package "automake" -package "libxml2-dev" -package "libboost-dev" -package "libboost-program-options-dev" -package "libboost-date-time-dev" -package "libboost-filesystem-dev" -package "libboost-thread-dev" -package "libboost-iostreams-dev" -package "libosmpbf-dev" -package "libprotobuf-dev" -package "osmpbf-bin" -# Add planet-mirror-redirect-update dependencies -package "php-cli" -package "php-curl" +package %w[ + gcc + g++ + make + autoconf + automake + pkg-config + libxml2-dev + libboost-dev + libboost-program-options-dev + libboost-date-time-dev + libboost-filesystem-dev + libboost-thread-dev + libboost-iostreams-dev + libosmpbf-dev + libprotobuf-dev + osmpbf-bin + pbzip2 + php-cli + php-curl + mktorrent + xmlstarlet + libxml2-utils + inotify-tools +] directory "/opt/planet-dump-ng" do owner "root" group "root" - mode 0755 + mode "755" end git "/opt/planet-dump-ng" do action :sync - repository "git://github.com/zerebubuth/planet-dump-ng.git" - revision "v1.1.4" + repository "https://github.com/zerebubuth/planet-dump-ng.git" + revision "v1.2.6" + depth 1 user "root" group "root" end @@ -90,21 +90,62 @@ end directory "/store/planetdump" do owner "www-data" group "www-data" - mode 0755 + mode "755" + recursive true end -["planetdump", "planet-mirror-redirect-update", "apache-latest-planet-filename"].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" group "root" - mode 0755 + mode "755" end end -template "/etc/cron.d/planet-dump-mirror" do - source "planet-dump-mirror-cron.erb" - owner "root" - group "root" - mode 0644 +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 + +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 + +systemd_timer "planet-dump-mirror" do + description "Update planet dump mirrors" + on_boot_sec "10min" + on_unit_inactive_sec "10min" +end + +service "planet-dump-mirror.timer" do + action [:enable, :start] end