Updates to new backupninja module structure

diff --git a/manifests/init.pp b/manifests/init.pp
index 90508d0b283b6c033465e97747f56f7d34a90ba8..de743b4df813c9998038a35a81b173a4b2c126e0 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -28,14 +28,18 @@ class backup(
 
   include backup::params
 
-  # TODO: backupninja classes should be parametrized
-  $backupdir                  = $backup::params::backupdir
-  $backupdir_ensure           = $backup::params::backupdir_ensure
-  $backupninja_ensure_version = $backup::params::backupninja_ensure_version
+  class { 'backupninja':
+    loglvl                     => 4,
+    usecolors                  => false,
+    when                       => $when,
+    reportwarning              => $reportwarning,
+    ensure_backupninja_version => $backup::params::backupninja_ensure_version,
+  }
 
-  include backupninja::server
-  include backupninja::client::duplicity
-  include backupninja::client::rdiff_backup
+  class { 'backupninja::server':
+    backupdir        => $backup::params::backupdir,
+    backupdir_ensure => $backup::params::backupdir_ensure,
+  }
 
   package { "debconf-utils": ensure => installed, }
   package { "hwinfo":        ensure => installed, }
@@ -48,13 +52,6 @@ class backup(
     },
   }
 
-  backupninja::config { "conf":
-    loglvl        => 4,
-    usecolors     => false,
-    when          => $when,
-    reportwarning => $reportwarning,
-  }
-
   file { "${backup::params::backupdir_remote}":
     ensure => directory,
     owner  => root,

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 234562ef8ead9a579ca2214c82fadd396a8d698e..eecb1f6cff541e975a34c69d6818aa55c734ea16 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -17,7 +17,7 @@ define backup::rdiff(
     subfolder      => "rdiff",
     user           => "$hostname",
     sshoptions     => "-p $port",
-    installkey     => false,
+    keymanage      => false,
     backupkeytype  => "rsa",
     backupkeystore => "puppet:///pubkeys",
   }

diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index a83e695423e4183850ef79b2d1b0858dcfd5d707..b407548590619deaa521daa45feafd79453d453f 100644 (file)
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -8,7 +8,7 @@ define backup::rsync(
   backupninja::rsync { "rsync-$title.$use_domain":
     # [general]
     ensure         => $ensure,
-    installkey     => false,
+    keymanage      => false,
     home           => "${backup::params::backupdir}/remote/$use_fqdn",
     backupdir      => "${backup::params::backupdir}/remote/$use_fqdn/rsync",
     backupkeytype  => "rsa",