Commit acb2e81d authored by Silvio Rhatto's avatar Silvio Rhatto

Minor fixes

parent 3eed9efd
...@@ -9,7 +9,7 @@ define backupninja::rsync( ...@@ -9,7 +9,7 @@ define backupninja::rsync(
$nagios2_description = 'backups', $subfolder = 'rsync', $nagios2_description = 'backups', $subfolder = 'rsync',
$log = false, $partition = false, $fscheck = false, $read_only = false, $log = false, $partition = false, $fscheck = false, $read_only = false,
$mountpoint = false, $backupdir = false, $format = false, $days = '5', $mountpoint = false, $backupdir = false, $format = false, $days = false,
$keepdaily = false, $keepweekly = false, $keepmonthly = false, $lockfile = false, $keepdaily = false, $keepweekly = false, $keepmonthly = false, $lockfile = false,
$nicelevel = 0, $enable_mv_timestamp_bug = false, $tmp = false, $multiconnection = false, $nicelevel = 0, $enable_mv_timestamp_bug = false, $tmp = false, $multiconnection = false,
...@@ -31,17 +31,17 @@ define backupninja::rsync( ...@@ -31,17 +31,17 @@ define backupninja::rsync(
{ {
include backupninja::client::rsync include backupninja::client::rsync
# Right now just local origin and remote destination is supported. # Right now just local origin with remote destination is supported.
$from = local $from = 'local'
$dest = remote $dest = 'remote'
case $dest { case $dest {
'remote': { 'remote': {
case $host { false: { err("need to define a host for remote backups!") } } case $host { false: { err("need to define a host for remote backups!") } }
$real_backuptag = $backuptag ? { $real_backuptag = $backuptag ? {
false => "backupninja-$fqdn", false => "backupninja-$fqdn",
default => $backuptag default => $backuptag,
} }
$real_home = $home ? { $real_home = $home ? {
......
...@@ -20,7 +20,7 @@ end -%> ...@@ -20,7 +20,7 @@ end -%>
end -%> end -%>
[dest] [dest]
<%- %w{dest, testconnect, ssh, protocol, numericids, compress, host, port, user, id_file, bandwidthlimit, remote_rsync, batch, batchbase, fakesuper}.each do |v| <%- %w{dest testconnect ssh protocol numericids compress host port user id_file bandwidthlimit remote_rsync batch batchbase fakesuper}.each do |v|
if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%> if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
<%= v + ' = ' + instance_variable_get("@#{v}").to_s %> <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
<%- <%-
...@@ -28,7 +28,7 @@ end -%> ...@@ -28,7 +28,7 @@ end -%>
end -%> end -%>
[services] [services]
<%- %w{initscripts, service}.each do |v| <%- %w{initscripts service}.each do |v|
if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%> if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
<%= v + ' = ' + instance_variable_get("@#{v}").to_s %> <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
<%- <%-
...@@ -36,7 +36,7 @@ end -%> ...@@ -36,7 +36,7 @@ end -%>
end -%> end -%>
[system] [system]
<%- %w{rm, cp, touch, mv fsck}.each do |v| <%- %w{rm cp touch mv fsck}.each do |v|
if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%> if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
<%= v + ' = ' + instance_variable_get("@#{v}").to_s %> <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
<%- <%-
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment