Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@ cache: bundler
matrix:
fast_finish: true
include:
- rvm: 2.1
- rvm: 2.3
env: PUPPET_GEM_VERSION="~> 4.0"
script: "bundle exec rake validate"
- rvm: 2.1
- rvm: 2.3
env: PUPPET_GEM_VERSION="~> 4.0"
script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
- rvm: 2.1
- rvm: 2.3
env: PUPPET_GEM_VERSION="~> 4.0"
script: "bundle exec rake beaker"
services: docker
sudo: required
notifications:
email: false

14 changes: 8 additions & 6 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -190,19 +190,21 @@
# create cron files for each backup level
# merge possible cron definitions to one
$real_cron = deep_merge($rsnapshot::params::cron, $rsnapshot::cron, $hash[cron])
$cmd_rsnapshot = pick($rsnapshot::cmd_rsnapshot, $rsnapshot::params::config_cmd_rsnapshot)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't find $rsnapshot::cmd_rsnapshot (no $cmd_rsnapshot in init.pp). Seems to produce warnings in the test suite.


concat::fragment { "mailto for ${host}":
content => "#This file is managed by puppet\nMAILTO=${real_cron[mailto]}\n\n",
target => $cronfile,
order => 1,
}

$backup_levels.each |String $level| {
$mailto = $real_cron[mailto]
$minute = rand_from_array($real_cron[$level][minute], "${host}.${level}.minute")
$hour = rand_from_array($real_cron[$level][hour], "${host}.${level}.hour")
$monthday = rand_from_array($real_cron[$level][monthday], "${host}.${level}.monthday")
$month = rand_from_array($real_cron[$level][month], "${host}.${level}.month")
$weekday = rand_from_array($real_cron[$level][weekday], "${host}.${level}.weekday")
$mailto = $real_cron[mailto]
$minute = rand_from_array($real_cron[$level][minute], "${host}.${level}.minute")
$hour = rand_from_array($real_cron[$level][hour], "${host}.${level}.hour")
$monthday = rand_from_array($real_cron[$level][monthday], "${host}.${level}.monthday")
$month = rand_from_array($real_cron[$level][month], "${host}.${level}.month")
$weekday = rand_from_array($real_cron[$level][weekday], "${host}.${level}.weekday")

concat::fragment { "${host}.${level}":
target => $cronfile,
Expand Down
26 changes: 20 additions & 6 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
# default params
class rsnapshot::params {
$hosts = undef
$conf_d = '/etc/rsnapshot' # the place where the host specific configs are stored
$conf_d = $::osfamily ? {
'FreeBSD' => '/usr/local/etc/rsnapshot', # the place where the host specific configs are stored
default => '/etc/rsnapshot,' # the place where the host specific configs are stored
}
$config_backup_user = 'root'
$package_name = 'rsnapshot'
$package_ensure = 'present'
$cron_service_name = $::osfamily ? {
'RedHat' => 'crond',
'Debian' => 'cron',
default => '',
'RedHat' => 'crond',
'Debian' => 'cron',
'FreeBSD' => 'cron',
default => '',
}
$manage_cron = true
$cron_dir = '/etc/cron.d'
Expand All @@ -20,11 +24,21 @@
$config_check_mk_job = false
$config_cmd_cp = '/bin/cp'
$config_cmd_rm = '/bin/rm'
$config_cmd_rsync = '/usr/bin/rsync'
$config_cmd_rsync = $::osfamily ? {
'FreeBSD' => '/usr/local/bin/rsync',
default => '/usr/bin/rsync',
}
$config_cmd_ssh = '/usr/bin/ssh'
$config_cmd_logger = '/usr/bin/logger'
$config_cmd_du = '/usr/bin/du'
$config_cmd_rsnapshot_diff = '/usr/bin/rsnapshot-diff'
$config_cmd_rsnapshot = $::osfamily ? {
'FreeBSD' => '/usr/local/bin/rsnapshot',
default => '/usr/bin/rsnapshot',
}
$config_cmd_rsnapshot_diff = $::osfamily ? {
'FreeBSD' => '/usr/local/bin/rsnapshot-diff',
default => '/usr/bin/rsnapshot-diff',
}
$config_cmd_preexec = undef
$config_cmd_postexec = undef
$config_cronfile_prefix = 'rsnapshot_'
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": [
{ "name": "puppetlabs-stdlib","version_requirement": ">= 1.0.0" },
{ "name": "stahnma-epel","version_requirement": ">= 1.0.0" },
{ "name": "puppetlabs-concat","version_requirement": ">= 2.0.0 < 3.0.0" }
{ "name": "puppetlabs-concat","version_requirement": ">= 2.0.0" }
],
"operatingsystem_support": [
{
Expand Down
2 changes: 1 addition & 1 deletion templates/cron.erb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<%= @minute %> <%= @hour %> <%= @monthday %> <%= @month %> <%= @weekday %> root<% if scope['rsnapshot::check_mk_job'] == true -%> mk-job rsnapshot_<%= @host %>_<%= @level %><% end -%> /usr/bin/rsnapshot -c <%= @config %> <%= @level %>
<%= @minute %> <%= @hour %> <%= @monthday %> <%= @month %> <%= @weekday %> root<% if scope['rsnapshot::check_mk_job'] == true -%> mk-job rsnapshot_<%= @host %>_<%= @level %><% end -%> <%= @cmd_rsnapshot %> -c <%= @config %> <%= @level %>