aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/duplicity.pp4
-rw-r--r--manifests/params.pp8
-rw-r--r--manifests/rdiff.pp4
-rw-r--r--manifests/rsync.pp4
4 files changed, 10 insertions, 10 deletions
diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index 115efb1..39f12b6 100644
--- a/manifests/duplicity.pp
+++ b/manifests/duplicity.pp
@@ -14,8 +14,8 @@ define backup::duplicity(
case $encryptkey { false: { err("need to define a key!") } }
case $password { false: { err("need to define password!") } }
- $exclude_unencrypted = $backup::params::backup_exclude_unencrypted
- $include_unencrypted = $backup::params::backup_include_unencrypted
+ $exclude_unencrypted = $backup::params::exclude_unencrypted
+ $include_unencrypted = $backup::params::include_unencrypted
include backupninja::client
diff --git a/manifests/params.pp b/manifests/params.pp
index dedb033..caeff04 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,12 +5,12 @@ class backup::params {
$backupdir_ensure = hiera('backup::dir::ensure', 'directory')
# for data that's going to be encrypted and signed
- $backup_include_unencrypted = [ "/etc", "/var", "/home", ]
- $backup_exclude_unencrypted = [ "$backupdir_remote", "$backupdir/duplicity", "$backupdir/restore", "/var/cache", "/var/log", "/var/vservers", "/var/chroot", "/root/.cache", "/var/lib/dpkg", "/var/lib/apt", "/var/lib/aptitude/", "/var/sites/backups", "/var/data/crypt", "/data/backups", "/data/cache" ]
+ $include_unencrypted = [ "/etc", "/var", "/home", ]
+ $exclude_unencrypted = [ "$backupdir_remote", "$backupdir/duplicity", "$backupdir/restore", "/var/cache", "/var/log", "/var/vservers", "/var/chroot", "/root/.cache", "/var/lib/dpkg", "/var/lib/apt", "/var/lib/aptitude/", "/var/sites/backups", "/var/data/crypt", "/data/backups", "/data/cache" ]
# for data that were previously encrypted and signed
- $backup_include_encrypted = [ "$backupdir/duplicity", ]
- $backup_exclude_encrypted = [ "$backupdir/duplicity/.ssh", ]
+ $include_encrypted = [ "$backupdir/duplicity", ]
+ $exclude_encrypted = [ "$backupdir/duplicity/.ssh", ]
# ensure the latest backup version
$backupninja_ensure_version = 'latest'
diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 1870cf8..234562e 100644
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -8,8 +8,8 @@ define backup::rdiff(
options => "--remote-schema 'ssh -p $port -C %s rdiff-backup --server'",
# [source]
keep => "10",
- include => $backup::params::backup_include_encrypted,
- exclude => $backup::params::backup_exclude_encrypted,
+ include => $backup::params::include_encrypted,
+ exclude => $backup::params::exclude_encrypted,
# [dest]
type => "remote",
host => "$title.$domain",
diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index 1e9513e..a83e695 100644
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -21,8 +21,8 @@ define backup::rsync(
log => "/var/log/backup/rsync-$title.$use_domain.log",
lockfile => "/var/lock/rsync-$title.$use_domain.lock",
# [source]
- include => $backup::params::backup_include_encrypted,
- exclude => $backup::params::backup_exclude_encrypted,
+ include => $backup::params::include_encrypted,
+ exclude => $backup::params::exclude_encrypted,
# [dest]
user => "$hostname",
host => "$title.$use_domain",