Merge pull request #8 from rudybroersma/master

Please look at my first ever pull request :)

Author: tedivm

README.md

@@ -169,6 +169,9 @@ This class has two required parameters- the backup `server`, which should be an
 fqdn, and an array of `directories` to back up. Additional options, such as
 retain rules or cronjob times, can be overridden as needed.
 
+When the retain values are set to zero, no cron entry for that specific
+period is created.
+
 ```puppet
 class { 'rsnapshot::client':
   server             => 'backups.example.com',
@@ -481,4 +484,4 @@ an rsnapshot server to backup clients that are not controlled by puppet.
 ## Development
 
 Contributions are always welcome. Please read the [Contributing Guide](CONTRIBUTING.md)
-to get started.
+to get started.

manifests/server/config.pp

@@ -67,7 +67,7 @@
     $rsync_wrapper_processed = "--rsync-path=\"${wrapper_path_norm}/${wrapper_rsync_ssh}\""
   }
 
-  $rsync_long_args_final = "${ssh_args_processed} ${rsync_long_args} ${rsync_wrapper_processed}"
+  $rsync_long_args_final = "${ssh_args_processed} ${rsync_long_args} ${rsync_wrapper_processed}".strip
 
 
   file { $snapshot_root :
@@ -83,37 +83,45 @@
   # cronjobs
 
   ## hourly
-  cron { "rsnapshot-${name}-hourly" :
-    command => "${rsnapshot::server::cmd_rsnapshot} -c ${config_file} hourly",
-    user    => $server_user,
-    hour    => $backup_hourly_cron,
-    minute  => $backup_time_minute
-  } ->
+  if ($retain_hourly > 0) {
+    cron { "rsnapshot-${name}-hourly" :
+      command => "${rsnapshot::server::cmd_rsnapshot} -c ${config_file} hourly",
+      user    => $server_user,
+      hour    => $backup_hourly_cron,
+      minute  => $backup_time_minute
+    }
+  }
 
   ## daily
-  cron { "rsnapshot-${name}-daily" :
-    command => "${rsnapshot::server::cmd_rsnapshot} -c ${config_file} daily",
-    user    => $server_user,
-    hour    => $backup_time_hour,
-    minute  => ($backup_time_minute + 50) % 60
-  } ->
+  if ($retain_daily > 0) {
+    cron { "rsnapshot-${name}-daily" :
+      command => "${rsnapshot::server::cmd_rsnapshot} -c ${config_file} daily",
+      user    => $server_user,
+      hour    => $backup_time_hour,
+      minute  => ($backup_time_minute + 50) % 60
+    }
+  }
 
   ## weekly
-  cron { "rsnapshot-${name}-weekly" :
-    command => "${rsnapshot::server::cmd_rsnapshot} -c ${config_file} weekly",
-    user    => $server_user,
-    hour    => ($backup_time_hour + 3) % 24,
-    minute  => ($backup_time_minute + 50) % 60,
-    weekday => $backup_time_weekday
-  } ->
+  if ($retain_weekly > 0) {
+    cron { "rsnapshot-${name}-weekly" :
+      command => "${rsnapshot::server::cmd_rsnapshot} -c ${config_file} weekly",
+      user    => $server_user,
+      hour    => ($backup_time_hour + 3) % 24,
+      minute  => ($backup_time_minute + 50) % 60,
+      weekday => $backup_time_weekday
+    }
+  }
 
   ## monthly
-  cron { "rsnapshot-${name}-monthly" :
-    command  => "${rsnapshot::server::cmd_rsnapshot} -c ${config_file} monthly",
-    user     => $server_user,
-    hour     => ($backup_time_hour + 7) % 24,
-    minute   => ($backup_time_minute + 50) % 60,
-    monthday => $backup_time_dom
+  if ($retain_monthly > 0) {
+    cron { "rsnapshot-${name}-monthly" :
+      command  => "${rsnapshot::server::cmd_rsnapshot} -c ${config_file} monthly",
+      user     => $server_user,
+      hour     => ($backup_time_hour + 7) % 24,
+      minute   => ($backup_time_minute + 50) % 60,
+      monthday => $backup_time_dom
+    }
   }
 
   $programs = {

templates/config.erb

@@ -101,5 +101,5 @@ exclude	<%= value %>
 ###############################
 
 <% @directories.each do |source_dir| -%>
-backup	<%= @client_user %>@<%= @name %>:<%= source_dir.gsub(/\/$/, '') %>/<%= "\t" %>
+backup  <%= @client_user %>@<%= @name %>:<%= source_dir.gsub(/\/$/, '') %>/<%= "\t" %><%= "\t\t." %>
 <% end -%>