kris/puppet-rsnapshot
1
0
Fork 0
mirror of https://github.com/krislamo/puppet-rsnapshot synced 2024-11-14 01:00:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'release/0.4.1'

Browse Source
This commit is contained in:
Norbert Varzariu 2016-01-20 11:45:41 +01:00
commit 2cccc86433
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/config.pp
View File

@ -5,6 +5,7 @@ class rsnapshot::config (
$hosts = $rsnapshot::hosts, $hosts = $rsnapshot::hosts,
$cron_dir = $rsnapshot::cron_dir, $cron_dir = $rsnapshot::cron_dir,
) { ) {
# these are global settings, no point in setting them per host # these are global settings, no point in setting them per host
$config_version = $rsnapshot::params::config_version $config_version = $rsnapshot::params::config_version
$lockpath = pick($rsnapshot::lockpath, $rsnapshot::params::config_lockpath, '/var/run/rsnapshot') $lockpath = pick($rsnapshot::lockpath, $rsnapshot::params::config_lockpath, '/var/run/rsnapshot')
@ -33,7 +34,7 @@ class rsnapshot::config (
$hosts_clean.each |String $host, $hash | { $hosts_clean.each |String $host, $hash | {
$backup_user = pick($hash['backup_user'], $rsnapshot::params::config_backup_user) $backup_user = pick($hash['backup_user'], $rsnapshot::params::config_backup_user)
$default_backup_dirs = pick($rsnapshot::default_backup, $rsnapshot::params::config_default_backup) $default_backup_dirs = pick($rsnapshot::default_backup, $rsnapshot::params::config_default_backup)
$backup_levels = pick($hash['backup_levels'], $rsnapshot::params::config_backup_levels, 'weekly') $backup_levels = pick($hash['backup_levels'], $rsnapshot::backup_levels, 'weekly')
$backup = $hash['backup'] $backup = $hash['backup']
$backup_defaults = pick($hash['backup_defaults'], $rsnapshot::params::config_backup_defaults) $backup_defaults = pick($hash['backup_defaults'], $rsnapshot::params::config_backup_defaults)
$cmd_cp = pick($hash['cmd_cp'], $rsnapshot::params::config_cmd_cp) $cmd_cp = pick($hash['cmd_cp'], $rsnapshot::params::config_cmd_cp)
@ -66,9 +67,9 @@ class rsnapshot::config (
$one_fs = pick_undef($hash['one_fs'], $rsnapshot::params::config_one_fs) $one_fs = pick_undef($hash['one_fs'], $rsnapshot::params::config_one_fs)
$interval = pick($hash['interval'], $rsnapshot::params::config_interval) $interval = pick($hash['interval'], $rsnapshot::params::config_interval)
$retain = pick_undef($hash['retain'], $rsnapshot::params::config_retain) $retain = pick_undef($hash['retain'], $rsnapshot::params::config_retain)
$include = pick_undef($hash['include'], $rsnapshot::params::config_include) $include = pick($hash['include'], [])
$exclude = pick_undef($hash['exclude'], $rsnapshot::params::config_exclude) $exclude = pick($hash['exclude'], [])
$include_file = pick_undef($hash['include_file'], $rsnapshot::params::config_include_file) $include_file = pick($hash['include_file'], $rsnapshot::params::config_include_file, "${conf_d}/${host}.include")
$exclude_file = pick($hash['exclude_file'], $rsnapshot::params::config_exclude_file, "${conf_d}/${host}.exclude") $exclude_file = pick($hash['exclude_file'], $rsnapshot::params::config_exclude_file, "${conf_d}/${host}.exclude")
$link_dest = pick_undef($hash['link_dest'], $rsnapshot::params::config_link_dest) $link_dest = pick_undef($hash['link_dest'], $rsnapshot::params::config_link_dest)
$sync_first = pick_undef($hash['sync_first'], $rsnapshot::params::config_sync_first) $sync_first = pick_undef($hash['sync_first'], $rsnapshot::params::config_sync_first)
@ -108,19 +109,22 @@ class rsnapshot::config (
$use_lazy_deletes_num = bool2num($use_lazy_deletes) $use_lazy_deletes_num = bool2num($use_lazy_deletes)
} }
if $include != '' { $real_include = $rsnapshot::include + $include
unless empty($real_include) {
file { $include_file: file { $include_file:
ensure => 'file', ensure => 'file',
content => template('rsnapshot/include.erb'), content => template('rsnapshot/include.erb'),
} }
} }
if $exclude != '' { $real_exclude = $rsnapshot::exclude + $exclude
unless empty($real_exclude) {
file { $exclude_file: file { $exclude_file:
ensure => 'file', ensure => 'file',
content => template('rsnapshot/exclude.erb'), content => template('rsnapshot/exclude.erb'),
} }
} }
concat { $config: concat { $config:
} }
concat::fragment { "${config} for ${host}": concat::fragment { "${config} for ${host}":

2
manifests/init.pp
View File

@ -14,8 +14,10 @@ class rsnapshot (
$package_ensure = $rsnapshot::params::package_ensure, $package_ensure = $rsnapshot::params::package_ensure,
$cron = $rsnapshot::params::cron, $cron = $rsnapshot::params::cron,
$backup_scripts = $rsnapshot::params::backup_scripts, $backup_scripts = $rsnapshot::params::backup_scripts,
$include = $rsnapshot::params::config_include,
$exclude = $rsnapshot::params::config_exclude, $exclude = $rsnapshot::params::config_exclude,
$snapshot_root = $rsnapshot::params::config_snapshot_root, $snapshot_root = $rsnapshot::params::config_snapshot_root,
$backup_levels = $rsnapshot::params::config_backup_levels,
) inherits rsnapshot::params { ) inherits rsnapshot::params {
$default_backup_scripts = $rsnapshot::params::backup_scripts + $backup_scripts $default_backup_scripts = $rsnapshot::params::backup_scripts + $backup_scripts

2
metadata.json
View File

@ -1,6 +1,6 @@
{ {
"name": "loomsen-rsnapshot", "name": "loomsen-rsnapshot",
"version": "0.4.0", "version": "0.4.1",
"author": "loomsen", "author": "loomsen",
"summary": "Configures rsnapshot.", "summary": "Configures rsnapshot.",
"license": "Apache-2.0", "license": "Apache-2.0",

2
templates/exclude.erb
View File

@ -1,3 +1,3 @@
<% @exclude.each do |exc| -%> <% @real_exclude.each do |exc| -%>
<%= exc %> <%= exc %>
<% end %> <% end %>

2
templates/include.erb
View File

@ -1,3 +1,3 @@
<% @include.each do |inc| -%> <% @real_include.each do |inc| -%>
<%= inc %> <%= inc %>
<% end %> <% end %>