diff options
| -rw-r--r-- | manifests/rsync.pp | 12 | ||||
| -rw-r--r-- | templates/rsync.conf.erb | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/manifests/rsync.pp b/manifests/rsync.pp index f973004..1c82889 100644 --- a/manifests/rsync.pp +++ b/manifests/rsync.pp @@ -9,7 +9,7 @@ define backupninja::rsync( $nagios2_description = 'backups', $subfolder = 'rsync', $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, $nicelevel = 0, $enable_mv_timestamp_bug = false, $tmp = false, $multiconnection = false, @@ -31,17 +31,17 @@ define backupninja::rsync( { include backupninja::client::rsync - # Right now just local origin and remote destination is supported. - $from = local - $dest = remote + # Right now just local origin with remote destination is supported. + $from = 'local' + $dest = 'remote' case $dest { 'remote': { case $host { false: { err("need to define a host for remote backups!") } } $real_backuptag = $backuptag ? { - false => "backupninja-$fqdn", - default => $backuptag + false => "backupninja-$fqdn", + default => $backuptag, } $real_home = $home ? { diff --git a/templates/rsync.conf.erb b/templates/rsync.conf.erb index 1f0a503..71bf0b6 100644 --- a/templates/rsync.conf.erb +++ b/templates/rsync.conf.erb @@ -20,7 +20,7 @@ end -%> end -%> [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" -%> <%= v + ' = ' + instance_variable_get("@#{v}").to_s %> <%- @@ -28,7 +28,7 @@ end -%> end -%> [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" -%> <%= v + ' = ' + instance_variable_get("@#{v}").to_s %> <%- @@ -36,7 +36,7 @@ end -%> end -%> [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" -%> <%= v + ' = ' + instance_variable_get("@#{v}").to_s %> <%- |