aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/sync-media10
-rw-r--r--manifests/init.pp25
-rw-r--r--manifests/rdiff.pp2
-rw-r--r--manifests/rsync.pp2
4 files changed, 23 insertions, 16 deletions
diff --git a/files/sync-media b/files/sync-media
index 1f1684f..5a432f8 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/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",