diff options
| -rw-r--r-- | files/sync-media | 10 | ||||
| -rw-r--r-- | manifests/duplicity.pp | 8 | ||||
| -rw-r--r-- | manifests/init.pp | 25 | ||||
| -rw-r--r-- | manifests/rdiff.pp | 2 | ||||
| -rw-r--r-- | manifests/rsync.pp | 2 |
5 files changed, 27 insertions, 20 deletions
diff --git a/files/sync-media b/files/sync-media index 6fba114..a6e0ebe 100644 --- a/files/sync-media +++ b/files/sync-media @@ -89,6 +89,11 @@ if [ -d "$CACHE" ]; then continue fi + #if [ "`git -C $CACHE/$folder config sync-media.ready`" != "true" ]; then + # echo "Skipping $CACHE/$folder: not sync-media ready, please config your repo." + # continue + #fi + ( cd $CACHE/$folder echo "Syncing $CACHE/$folder..." @@ -133,6 +138,11 @@ if [ -d "$CACHE" ]; then continue fi + #if [ "`git -C $CACHE/$folder config sync-media.ready`" != "true" ]; then + # echo "Skipping $CACHE/$folder: not sync-media ready, please config your repo." + # continue + #fi + if [ ! -d "$VOLUME/$MEDIA/$folder" ]; then ( cd $VOLUME/$MEDIA diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp index 7183492..8660bcc 100644 --- a/manifests/duplicity.pp +++ b/manifests/duplicity.pp @@ -17,7 +17,7 @@ define backup::duplicity( $exclude_unencrypted = $backup::params::exclude_unencrypted $include_unencrypted = $backup::params::include_unencrypted - include backupninja::client + include backupninja # backup dest folder file { "${backup::params::backupdir}/duplicity": @@ -27,18 +27,18 @@ define backup::duplicity( } # the backupninja rule for this duplicity backup - file { "${backupninja::client::defaults::configdir}/${order}_duplicity-${title}.sh": + file { "${backupninja::configdir}/${order}_duplicity-${title}.sh": ensure => $ensure, content => template('backup/duplicity.conf.erb'), owner => root, group => root, mode => 0600, - require => File["${backupninja::client::defaults::configdir}"], + require => File["${backupninja::configdir}"], } # check duplicity backups once a week cron { "duplicity_check-$title.$domain": - command => "/bin/bash ${backupninja::client::defaults::configdir}/${order}_duplicity-${title}.sh --check", + command => "/bin/bash ${backupninja::configdir}/${order}_duplicity-${title}.sh --check", user => root, hour => "0", minute => "0", 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", |