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

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

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 85d49bc09caf4b3ead8532b5e9bb49de8ddbb34f..d5a8485d7efade32f704036b92df4c2b72146278 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -22,6 +22,7 @@ require "yaml"
 include_recipe "accounts"
 include_recipe "apt"
 include_recipe "osmosis"
+include_recipe "planet::aws"
 include_recipe "ruby"
 include_recipe "tools"
 
@@ -312,6 +313,7 @@ systemd_service "replication-hourly" do
   exec_start "/usr/local/bin/osmosis -q --merge-replication-files workingDirectory=/var/lib/replication/hour"
   environment "LD_PRELOAD" => "/opt/flush/flush.so"
   sandbox :enable_network => true
+  memory_deny_write_execute false
   read_write_paths [
     "/store/planet/replication/hour",
     "/var/lib/replication/hour"
@@ -319,7 +321,7 @@ systemd_service "replication-hourly" do
 end
 
 systemd_timer "replication-hourly" do
-  description "Daily replication"
+  description "Hourly replication"
   on_calendar "*-*-* *:02/15:00"
 end
 
@@ -355,6 +357,7 @@ systemd_service "replication-daily" do
   exec_start "/usr/local/bin/osmosis -q --merge-replication-files workingDirectory=/var/lib/replication/day"
   environment "LD_PRELOAD" => "/opt/flush/flush.so"
   sandbox :enable_network => true
+  memory_deny_write_execute false
   read_write_paths [
     "/store/planet/replication/day",
     "/var/lib/replication/day"