Manage users folder and ensure latest borgbackup package

diff --git a/manifests/init.pp b/manifests/init.pp
index a4492cad1344de1d45325c13da8ec75c486d2be4..f4ce07cf50cbd567185950cb6b2b55073c48af79 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,7 +46,7 @@ class backup(
   }
 
   package { "duplicity":     ensure => installed, }
-  package { "borgbackup":    ensure => installed, }
+  package { "borgbackup":    ensure => latest,    }
   package { "debconf-utils": ensure => installed, }
 
   # See http://www.rfc3092.net/2013/09/missing-modules-for-paramiko-and-gio-in-duplicity-foo/
@@ -64,6 +64,13 @@ class backup(
     mode   => '0755',
   }
 
+  file { "${backup::params::backupdir_users}":
+    ensure => directory,
+    owner  => root,
+    group  => root,
+    mode   => '0755',
+  }
+
   file { "/var/log/backup":
     ensure => directory,
     owner  => root,

diff --git a/manifests/params.pp b/manifests/params.pp
index e94e1d33605d9d4b44042b7c9b7ac7791f1dc07e..81b6fd429c989a5d515e6842ca7d701fb822b402 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -2,6 +2,7 @@ class backup::params {
   # backup folder
   $backupdir        = "/var/backups"
   $backupdir_remote = "$backupdir/remote"
+  $backupdir_users  = "$backupdir/users"
   $backupdir_ensure = hiera('backup::dir::ensure', 'directory')
 
   # for data that's going to be encrypted and signed