diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-07-06 19:40:24 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-07-06 19:40:24 -0300 |
| commit | 38cad939299c7b0f5ecbc2e536087a844d4321da (patch) | |
| tree | 7988c4bc2acbd37a672e634feabd951c18d9ddc6 | |
| parent | dc96afc841e3b3ac9fad4006819714c1bf7ce8b0 (diff) | |
| download | puppet-backup-38cad939299c7b0f5ecbc2e536087a844d4321da.tar.gz puppet-backup-38cad939299c7b0f5ecbc2e536087a844d4321da.tar.bz2 | |
Updates to new backupninja module structure
| -rw-r--r-- | manifests/init.pp | 25 | ||||
| -rw-r--r-- | manifests/rdiff.pp | 2 | ||||
| -rw-r--r-- | manifests/rsync.pp | 2 |
3 files changed, 13 insertions, 16 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 90508d0..de743b4 100644 --- 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 234562e..eecb1f6 100644 --- 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 a83e695..b407548 100644 --- 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", |