From 571a286674b4a237bbe972aea2538332a0f739bf Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Tue, 17 Apr 2012 22:35:53 -0700 Subject: we don't need to stagger sys since it runs locally, it needs to be in rdiff instead. add control variable to turn it on --- templates/rdiff.conf.erb | 10 ++++++++++ templates/sys.conf.erb | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb index 23c336f..c948c2d 100644 --- a/templates/rdiff.conf.erb +++ b/templates/rdiff.conf.erb @@ -10,6 +10,16 @@ [source] type = local <%= 'keep = ' + keep if keep %> +<% if stagger -%> +when = everyday at 1:<%= i = 0 + total = 0 + until i == hostname.length + total += (hostname[i] - 96) / (2.9 * (10 ** (i + 1))) + total += (hostname[i] - 96) / (27.0 ** (i+1)) + i += 1 + end + (total*60).to_i %> +<% end -%> <% if include.is_a? String -%> <%= 'include = ' + include %> diff --git a/templates/sys.conf.erb b/templates/sys.conf.erb index 13e6106..a684e8b 100644 --- a/templates/sys.conf.erb +++ b/templates/sys.conf.erb @@ -9,13 +9,6 @@ end end -%> -when = everyday at 1:<%= i = 0 - total = 0 - until i == hostname.length - total += (hostname[i] - 96) / (2.9 * (10 ** (i + 1))) - i += 1 - end - (total*60).to_i %> packages = <%= packages ? 'yes' : 'no' %> partitions = <%= partitions ? 'yes' : 'no' %> dosfdisk = <%= dosfdisk ? 'yes' : 'no' %> -- cgit v1.2.3