1
0
mirror of https://github.com/krislamo/puppet-rsnapshot synced 2024-11-10 00:00:35 +00:00

add backup script feature, a lot of fixes

This commit is contained in:
Norbert Varzariu 2016-01-19 17:23:40 +01:00
parent 5fe01d46e1
commit 455ba13572
4 changed files with 30 additions and 34 deletions

View File

@ -9,7 +9,7 @@ class rsnapshot::config (
$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')
$conf_d = pick($rsnapshot::conf_d, $rsnapshot::params::conf_d, '/etc/rsnapshot') $conf_d = pick($rsnapshot::conf_d, $rsnapshot::params::conf_d, '/etc/rsnapshot')
$snapshot_root = pick($hosts['snapshot_root'], $rsnapshot::params::config_snapshot_root, '/backup') $snapshot_root = pick($hosts['snapshot_root'], $rsnapshot::snapshot_root, '/backup')
$default_cron = assert_empty_hash($::rsnapshot::cron) $default_cron = assert_empty_hash($::rsnapshot::cron)
# make sure lock path and conf path exist # make sure lock path and conf path exist
file { $conf_d: file { $conf_d:
@ -121,14 +121,17 @@ class rsnapshot::config (
content => template('rsnapshot/exclude.erb'), content => template('rsnapshot/exclude.erb'),
} }
} }
concat { $config:
file { $config: }
concat::fragment { "${config} for ${host}":
target => $config,
content => template('rsnapshot/rsnapshot.erb'), content => template('rsnapshot/rsnapshot.erb'),
} }
if has_key($hash, backup_scripts) { if has_key($hash, backup_scripts) {
$hash[backup_scripts].each |$script, $credentials| { $hash[backup_scripts].each |$script, $credentials| {
if is_hash($credentials) { if is_hash($credentials) {
$dbbackup_user = $credentials['dbbackup_user'] $dbbackup_user = $credentials['dbbackup_user']
$dbbackup_password = $credentials['dbbackup_password'] $dbbackup_password = $credentials['dbbackup_password']
@ -136,14 +139,12 @@ class rsnapshot::config (
$dbbackup_user = $rsnapshot::default_backup_scripts[$script]['dbbackup_user'] $dbbackup_user = $rsnapshot::default_backup_scripts[$script]['dbbackup_user']
$dbbackup_password = $rsnapshot::default_backup_scripts[$script]['dbbackup_password'] $dbbackup_password = $rsnapshot::default_backup_scripts[$script]['dbbackup_password']
} }
#notify { "Script: $script ----- Credentials: $credentials ----- Host: $host": }
concat::fragment { "${host}_${script}_backup":
file_line { "${host}_${script}_backup": target => $config,
ensure => present, content => "backup_script ${conf_d}/${host}.${script}.sh ./${script}\n",
path => $config,
line => "backup_script ${conf_d}/${host}.${script}.sh ./${script}",
} }
file { "${conf_d}/${host}.${script}.sh": file { "${conf_d}/${host}.${script}.sh":
ensure => present, ensure => present,
content => template("rsnapshot/${script}.sh.erb"), content => template("rsnapshot/${script}.sh.erb"),
@ -153,14 +154,9 @@ class rsnapshot::config (
} }
} }
$cronfile = "${cron_dir}/${host}" $cronfile = "${cron_dir}/${host}"
concat { $cronfile: concat { $cronfile:
} }
# create cron files for each backup level # create cron files for each backup level
$backup_levels.each |String $level| { $backup_levels.each |String $level| {

View File

@ -15,6 +15,7 @@ class rsnapshot (
$cron = $rsnapshot::params::cron, $cron = $rsnapshot::params::cron,
$backup_scripts = $rsnapshot::params::backup_scripts, $backup_scripts = $rsnapshot::params::backup_scripts,
$exclude = $rsnapshot::params::config_exclude, $exclude = $rsnapshot::params::config_exclude,
$snapshot_root = $rsnapshot::params::config_snapshot_root,
) inherits rsnapshot::params { ) inherits rsnapshot::params {
$default_backup_scripts = $rsnapshot::params::backup_scripts + $backup_scripts $default_backup_scripts = $rsnapshot::params::backup_scripts + $backup_scripts

View File

@ -8,7 +8,7 @@ class rsnapshot::params {
$package_name = 'rsnapshot' $package_name = 'rsnapshot'
$package_ensure = 'present' $package_ensure = 'present'
$cron_dir = '/etc/cron.d' $cron_dir = '/etc/cron.d'
$config_backup_levels = [ 'daily', 'weekly', ] $config_backup_levels = [ 'daily', 'weekly', 'monthly' ]
$config_backup_defaults = true $config_backup_defaults = true
$config_version = '1.2' $config_version = '1.2'
$config_cmd_cp = '/bin/cp' $config_cmd_cp = '/bin/cp'

View File

@ -1,8 +1,8 @@
# This file is being managed by puppet # This file is being managed by puppet
# Module 'rsnaphost' # Module 'rsnapshot'
config_version <%= @config_version %> config_version <%= @config_version %>
snapshot_root <%= @snapshot_root %> snapshot_root <%= @snapshot_root -%>/<%=@host%>
<% if @no_create_root != '' -%> <% if @no_create_root != '' -%>
no_create_root <%= @no_create_root %> no_create_root <%= @no_create_root %>
<% end -%> <% end -%>
@ -130,4 +130,3 @@ backup <%= @backup_user %>@<%=@host%>:<%= source %> <%=dest%>
backup <%=@host%>:<%= source %> <%=dest%> backup <%=@host%>:<%= source %> <%=dest%>
<% end -%> <% end -%>
<% end -%> <% end -%>