kris/puppet-rsnapshot
1
0
Fork 0
mirror of https://github.com/krislamo/puppet-rsnapshot synced 2024-12-16 09:40:35 +00:00
Code Issues Releases Wiki Activity

fix dependencies (current state fails for puppet 3)

Browse Source
This commit is contained in:
Norbert Varzariu 2015-12-21 15:16:58 +01:00
parent 05450e49b9
commit 3c5794c13b
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -0,0 +1 @@
validate for puppet 3

22
manifests/config.pp
View File

@ -87,9 +87,9 @@ class rsnapshot::config (
# merge the backup hashes to one if backup_default is set (defaults to true) # merge the backup hashes to one if backup_default is set (defaults to true)
if $backup_defaults { if $backup_defaults {
$backups = merge($backup, $default_backup_dirs) $backups = merge($backup, $default_backup_dirs)
} else { } else {
$backups = $backup $backups = $backup
} }
# one of both interval or retain must be present # one of both interval or retain must be present
@ -97,24 +97,24 @@ class rsnapshot::config (
$interval = pick($hash['interval'], $rsnapshot::params::config_interval) $interval = pick($hash['interval'], $rsnapshot::params::config_interval)
} }
# rsnapshot wants numeric values # rsnapshot wants numeric values
if $link_dest { if $link_dest {
$link_dest_num = bool2num($link_dest) $link_dest_num = bool2num($link_dest)
} }
if $sync_first { if $sync_first {
$sync_first_num = bool2num($sync_first) $sync_first_num = bool2num($sync_first)
} }
if $use_lazy_deletes { if $use_lazy_deletes {
$use_lazy_deletes_num = bool2num($use_lazy_deletes) $use_lazy_deletes_num = bool2num($use_lazy_deletes)
} }
file { $exclude_file: file { $exclude_file:
ensure => 'file', ensure => 'file',
} }
file { $config: file { $config:
content => template('rsnapshot/rsnapshot.erb') content => template('rsnapshot/rsnapshot.erb')
} }
$cronfile = "${cron_dir}/${host}" $cronfile = "${cron_dir}/${host}"
concat { "${cronfile}": concat { $cronfile:
} }
$backup_levels.each |String $level| { $backup_levels.each |String $level| {
if validate_hash($hash) { if validate_hash($hash) {
@ -139,7 +139,7 @@ class rsnapshot::config (
$month = rand_from_array($c_month, "${host}.${level}") $month = rand_from_array($c_month, "${host}.${level}")
$weekday = rand_from_array($c_weekday, "${host}.${level}") $weekday = rand_from_array($c_weekday, "${host}.${level}")
concat::fragment { "${host}.${level}": concat::fragment { "${host}.${level}":
target => "${cronfile}", target => $cronfile,
content => template('rsnapshot/cron.erb'), content => template('rsnapshot/cron.erb'),
} }
} }

6
metadata.json
View File

@ -1,6 +1,6 @@
{ {
"name": "loomsen-rsnapshot", "name": "loomsen-rsnapshot",
"version": "0.1.0", "version": "0.1.1",
"author": "loomsen", "author": "loomsen",
"summary": "Configures rsnapshot.", "summary": "Configures rsnapshot.",
"license": "Apache-2.0", "license": "Apache-2.0",
@ -13,8 +13,8 @@
"rsync" "rsync"
], ],
"requirements": [ "requirements": [
{ "name": "pe", "version_requirement": ">= 3.0.0" }, { "name": "pe", "version_requirement": ">= 4.0.0" },
{ "name": "puppet", "version_requirement": ">= 3.0.0" } { "name": "puppet", "version_requirement": ">= 4.0.0" }
], ],
"dependencies": [ "dependencies": [
{ "name": "puppetlabs-stdlib","version_range": ">= 1.0.0" }, { "name": "puppetlabs-stdlib","version_range": ">= 1.0.0" },