Add link to planet.osm Supporting OSM section

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 6cc509c62c5bdb979d5fb8e5a9ab421dfc0d43f6..d386eaa79ffb027d3adb27aa3c7a40e4b85bf0db 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -38,8 +38,6 @@ package %w[
   libprotobuf-dev
   osmpbf-bin
   pbzip2
   libprotobuf-dev
   osmpbf-bin
   pbzip2

-  php-cli
-  php-curl

   mktorrent
   xmlstarlet
   libxml2-utils
   mktorrent
   xmlstarlet
   libxml2-utils


@@ -95,7 +93,7 @@ directory "/store/planetdump" do
   recursive true
 end
 
   recursive true
 end
 

-%w[planetdump planetdump-trigger planet-mirror-redirect-update].each do |program|
+%w[planetdump planetdump-trigger].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"


@@ -109,7 +107,9 @@ systemd_service "planetdump@" do
   user "planet"
   exec_start "/usr/local/bin/planetdump %i"
   memory_max "64G"
   user "planet"
   exec_start "/usr/local/bin/planetdump %i"
   memory_max "64G"

-  sandbox true
+  sandbox :enable_network => true
+  protect_home "tmpfs"
+  bind_paths "/home/planet"

   read_write_paths [
     "/store/planetdump",
     "/store/planet/pbf",
   read_write_paths [
     "/store/planetdump",
     "/store/planet/pbf",


@@ -131,22 +131,3 @@ service "planetdump-trigger" do
   action [:enable, :start]
   subscribes :restart, "template[/usr/local/bin/planetdump-trigger]"
 end
   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
-
-service "planet-dump-mirror.timer" do
-  action [:enable, :start]
-end