Merge remote-tracking branch 'github/pull/357' into master

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

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 84fd53d9d70defc5b15781b8cdf752768f8446cf..51f0e69a216baa5684c78cb237c6fbb692413232 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -143,6 +143,18 @@ directory "/store/planet/replication/test/minute" do
   mode "755"
 end
 
+directory "/store/replication" do
+  owner "planet"
+  group "planet"
+  mode "755"
+end
+
+directory "/store/replication/minute" do
+  owner "planet"
+  group "planet"
+  mode "755"
+end
+
 systemd_tmpfile "/run/replication" do
   type "d"
   owner "planet"
@@ -180,7 +192,7 @@ osmdbt_config = {
   },
   "log_dir" => "/var/lib/replication/minute",
   "changes_dir" => "/store/planet/replication/test/minute",
-  "tmp_dir" => "/tmp",
+  "tmp_dir" => "/store/replication/minute",
   "run_dir" => "/run/replication"
 }
 
@@ -204,6 +216,12 @@ systemd_service "replication-minutely" do
   no_new_privileges true
 end
 
+systemd_timer "replication-minutely" do
+  description "Minutely replication"
+  on_boot_sec 60
+  on_unit_active_sec 60
+end
+
 template "/etc/replication/changesets.conf" do
   source "changesets.conf.erb"
   user "root"
@@ -291,10 +309,8 @@ if node[:planet][:replication] == "enabled"
     mailto "zerebubuth@gmail.com"
   end
 
-  systemd_timer "replication-minutely" do
-    description "Minutely replication"
-    on_boot_sec 60
-    on_unit_active_sec 60
+  service "replication-minutely.timer" do
+    action [:enable, :start]
   end
 
   cron_d "replication-minutely" do
@@ -332,6 +348,10 @@ else
     action :delete
   end
 
+  service "replication-minutely.timer" do
+    action [:stop, :disable]
+  end
+
   cron_d "replication-minutely" do
     action :delete
   end