aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-02 11:15:13 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-02 11:15:13 -0200
commited78086001d6fa8dad24c7f5d18c5c4abc2eea10 (patch)
treec29a559558693b2b0bdcf219a9b0d49b6a024e57
parent2e95f11a809a541c0ed852c7b2057dc53f49818d (diff)
parent2849ef277563377a140bacb2d9c05d20b38e5d2c (diff)
downloadpuppet-backupninja-ed78086001d6fa8dad24c7f5d18c5c4abc2eea10.tar.gz
puppet-backupninja-ed78086001d6fa8dad24c7f5d18c5c4abc2eea10.tar.bz2
Merge branch 'master' of git://labs.riseup.net/module_backupninja
-rw-r--r--manifests/sys.pp4
-rw-r--r--templates/sys.conf.erb2
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/sys.pp b/manifests/sys.pp
index 973f880..ac42e37 100644
--- a/manifests/sys.pp
+++ b/manifests/sys.pp
@@ -20,7 +20,9 @@ define backupninja::sys($order = 30,
$dosfdisk = yes,
$hardware = yes,
$hardwarefile = '/var/backups/hardware.txt',
- $dohwinfo = yes
+ $dohwinfo = yes,
+ $doluks = no,
+ $dolvm = no
) {
include backupninja::client::defaults
file { "${backupninja::client::defaults::configdir}/${order}_${name}.sys":
diff --git a/templates/sys.conf.erb b/templates/sys.conf.erb
index b0ae623..a684e8b 100644
--- a/templates/sys.conf.erb
+++ b/templates/sys.conf.erb
@@ -14,3 +14,5 @@ partitions = <%= partitions ? 'yes' : 'no' %>
dosfdisk = <%= dosfdisk ? 'yes' : 'no' %>
hardware = <%= hardware ? 'yes' : 'no' %>
dohwinfo = <%= dohwinfo ? 'yes' : 'no' %>
+luksheaders = <%= doluks ? 'yes' : 'no' %>
+lvm = <%= dolvm ? 'yes' : 'no' %>