Commit 149cba80 authored by Silvio Rhatto's avatar Silvio Rhatto

Merge branch 'master' of git://labs.riseup.net/module_backupninja

Conflicts:
	manifests/dup.pp
parents d162c842 d8909165
......@@ -36,19 +36,33 @@ A remote rdiff backup handler:
user => "backup-$hostname",
}
If you include the backupninja::client::rdiff_backup class, you will
get the rdiff-backup package installed automatically, this also works
for the backupninja::client::maildir class (installs needed rsync package)
To manage the installed backup software, using puppet package
management, you can include the backupninja::client::$backupprogram
class (where $backupprogram is one of: rdiff_backup, maildir,
duplicity). This will get the $backupprogram package installed
automatically, you do not need to include this class, if you wish to
manage the package version some other way, for example:
If you need to specify a specific version of the rdiff-backup, or rsync package, you can do so
by specifying the variables:
include backupninja::client::rdiff_backup
include backupninja::client::maildir
include backupninja::client::duplicity
When this class is included, it will make sure that the correct
version that is associated with puppet's 'installed' (or 'present')
parameter is installed. If you need to specify a specific version of
the rdiff-backup, rsync or duplicity packages, you can do so by
specifying the variables:
$rdiff_backup_ensure_version = "1.2.5-1~bpo40+1"
$rsync_ensure_version = "3.0.6-1~bpo50+1"
$duplicity_ensure_version = "0.6.04-1~bpo50+1"
If you do not specify these variables the default 'installed/present'
version will be installed when you include this class.
If you configure a backupninja::server, it will collect those users and create
them. We have yet to create proper authorized_keys management to make that
process completely automatic.
If you configure a backupninja::server, it will collect those users
and create them. We have yet to create proper authorized_keys
management to make that process completely automatic.
At the moment, not all the backupninja handlers are available, they are relatively
easy to add however.
\ No newline at end of file
At the moment, not all the backupninja handlers are available, they
are relatively easy to add however.
\ No newline at end of file
......@@ -109,3 +109,14 @@ class backupninja::client::rdiff_backup inherits backupninja::client {
}
}
}
class backupninja::client::duplicity inherits backupninja::client {
if !defined(Package["duplicity"]) {
if $duplicity_ensure_version == '' { $duplicity_ensure_version = 'installed' }
package { 'duplicity':
ensure => $duplicity_ensure_version,
}
}
}
......@@ -84,8 +84,6 @@ define backupninja::duplicity( $order = 90,
$backuptag = false,
# key options
$installkey = true ) {
# needed packages
package { "duplicity": ensure => installed }
# the client with configs for this machine
include backupninja::client
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment