Set default values and removed duplicates

Author: tedivm

manifests/server/config.pp

@@ -1,46 +1,43 @@
 define rsnapshot::server::config (
-  $config_path = undef,
-  $log_path = undef,
-  $backup_path = undef,
-  $backup_user = undef,
+
+  $config_path = $rsnapshot::params::server_config_path,
+  $backup_path = $rsnapshot::params::server_backup_path,
+  $log_path = $rsnapshot::params::server_log_path,
+  $lock_path = $rsnapshot::params::lock_path,
+  $backup_user = $rsnapshot::params::server_user,
+  $remote_user = $rsnapshot::params::client_user,
   $directories = {},
-  $lock_path = undef,
   $includes = {},
   $excludes = {},
   $include_files = {},
   $exclude_files = {},
-  $config_path = undef,
-  $log_path = undef,
-  $lock_path = undef,
-  $remote_user = undef,
-  $no_create_root = undef,
-  $verbose = undef,
-  $log_level = undef,
-  $link_dest = undef,
-  $sync_first = undef,
-  $use_lazy_deletes = undef,
-  $rsync_numtries = undef,
-  $stop_on_stale_lockfile = undef,
-  $user = undef,
-  $server = undef,
-  $backup_hourly_cron = undef,
-  $backup_time_minute = undef,
-  $backup_time_hour = undef,
-  $backup_time_weekday = undef,
-  $backup_time_dom = undef,
-  $cmd_preexec = undef,
-  $cmd_postexec = undef,
-  $retain_hourly = undef,
-  $retain_daily = undef,
-  $retain_weekly = undef,
-  $retain_monthly = undef,
-  $one_fs = undef,
-  $rsync_short_args = undef,
-  $rsync_long_args = undef,
-  $ssh_args = undef,
-  $wrapper_path = undef,
-  $du_args = undef,
-  $use_sudo = undef,
+  $server = $::fqdn,
+  $no_create_root = $rsnapshot::params::no_create_root,
+  $verbose = $rsnapshot::params::verbose,
+  $log_level = $rsnapshot::params::log_level,
+  $link_dest = $rsnapshot::params::link_dest,
+  $sync_first = $rsnapshot::params::sync_first,
+  $use_lazy_deletes = $rsnapshot::params::use_lazy_deletes,
+  $rsync_numtries = $rsnapshot::params::rsync_numtries,
+  $stop_on_stale_lockfile = $rsnapshot::params::stop_on_stale_lockfile,
+  $backup_hourly_cron = $rsnapshot::params::backup_hourly_cron,
+  $backup_time_minute = $rsnapshot::params::backup_time_minute,
+  $backup_time_hour = $rsnapshot::params::backup_time_hour,
+  $backup_time_weekday = $rsnapshot::params::backup_time_weekday,
+  $backup_time_dom = $rsnapshot::params::backup_time_dom,
+  $cmd_preexec = $rsnapshot::params::cmd_preexec,
+  $cmd_postexec = $rsnapshot::params::cmd_postexec,
+  $retain_hourly = $rsnapshot::params::retain_hourly,
+  $retain_daily = $rsnapshot::params::retain_daily,
+  $retain_weekly = $rsnapshot::params::retain_weekly,
+  $retain_monthly = $rsnapshot::params::retain_monthly,
+  $one_fs = $rsnapshot::params::one_fs,
+  $rsync_short_args = $rsnapshot::params::rsync_short_args,
+  $rsync_long_args = $rsnapshot::params::rsync_long_args,
+  $ssh_args = $rsnapshot::params::ssh_args,
+  $wrapper_path = $rsnapshot::params::wrapper_path,
+  $du_args = $rsnapshot::params::du_args,
+  $use_sudo = false,
   $wrapper_sudo = $rsnapshot::params::wrapper_sudo,
   $wrapper_rsync_sender = $rsnapshot::params::wrapper_rsync_sender,
   $wrapper_rsync_ssh = $rsnapshot::params::wrapper_rsync_ssh,
@@ -53,6 +50,8 @@
   $backup_path_norm = regsubst($backup_path, '\/$', '')
   $wrapper_path_norm = regsubst($wrapper_path, '\/$', '')
 
+  $user = $backup_user
+
   $log_file = "${log_path_norm}/${name}-rsnapshot.log"
   $lock_file = "${lock_path_norm}/${name}-rsnapshot.pid"
   $config_file = "${config_path_norm}/${name}-rsnapshot.conf"