Smaller param names

diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index 115efb141d2f3c352494a8fa419bc8cae563de9e..39f12b64c86ba500249592b60bb9032dcc01f346 100644 (file)
--- 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 dedb03340a064245c0a0fd52cb85957c33a2ff6f..caeff04c533b81f3acde1921742273959875ba50 100644 (file)
--- 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 1870cf8bb54afee807a779e04427764c09b2e1aa..234562ef8ead9a579ca2214c82fadd396a8d698e 100644 (file)
--- 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 1e9513e5a8c4509b6a20cf10c1ba553d5a4f8bac..a83e695423e4183850ef79b2d1b0858dcfd5d707 100644 (file)
--- 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",