From 3e63ce3c71620433dc135959b2743aa010b28fe1 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 17 May 2016 12:52:57 +0200
Subject: update submodules so "rake test" doesnt complain anymore

---
 puppet/modules/backupninja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/backupninja/manifests/labelmount.pp')

diff --git a/puppet/modules/backupninja b/puppet/modules/backupninja
index 49751354..5268a87c 160000
--- a/puppet/modules/backupninja
+++ b/puppet/modules/backupninja
@@ -1 +1 @@
-Subproject commit 497513547be79f9d3c8e96f1650ec43ee634b277
+Subproject commit 5268a87c329f895017f8ea6c6abc377a4f9a6a77
-- 
cgit v1.2.3


From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:41:59 -0400
Subject: remove submodules in preparation for move to subrepos

Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6
---
 puppet/modules/backupninja | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 puppet/modules/backupninja

(limited to 'puppet/modules/backupninja/manifests/labelmount.pp')

diff --git a/puppet/modules/backupninja b/puppet/modules/backupninja
deleted file mode 160000
index 5268a87c..00000000
--- a/puppet/modules/backupninja
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5268a87c329f895017f8ea6c6abc377a4f9a6a77
-- 
cgit v1.2.3


From 6a895ece94a86c9ccc32c9bec51413d4e4f0df8e Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 12 Jul 2016 16:46:29 -0400
Subject: git subrepo clone https://leap.se/git/puppet_backupninja
 puppet/modules/backupninja

subrepo:
  subdir:   "puppet/modules/backupninja"
  merged:   "5268a87"
upstream:
  origin:   "https://leap.se/git/puppet_backupninja"
  branch:   "master"
  commit:   "5268a87"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "1e79595"

Change-Id: I147608fbb12a35fe83642d4d031009dcc62cecee
---
 puppet/modules/backupninja/manifests/labelmount.pp | 62 ++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 puppet/modules/backupninja/manifests/labelmount.pp

(limited to 'puppet/modules/backupninja/manifests/labelmount.pp')

diff --git a/puppet/modules/backupninja/manifests/labelmount.pp b/puppet/modules/backupninja/manifests/labelmount.pp
new file mode 100644
index 00000000..8974cec1
--- /dev/null
+++ b/puppet/modules/backupninja/manifests/labelmount.pp
@@ -0,0 +1,62 @@
+# Mount a labelled partition on a directory as part of a backupninja run.
+#
+# This type will automatically create an unmount action with an order of 99
+# for the destination directory you specify here.
+#
+# Valid attributes for this type are:
+#
+#   order: The prefix to give to the handler config filename, to set
+#      order in which the actions are executed during the backup run.  Note
+#      that the value given here should be less than any action which
+#      requires the filesystem to be mounted!
+#
+#   ensure: Allows you to delete an entry if you don't want it any more
+#      (but be sure to keep the configdir, name, and order the same, so
+#      that we can find the correct file to remove).
+#
+#   label: The partition label to mount.
+#
+#   dest: The directory to mount the partition onto.
+# 
+define backupninja::labelmount($order = 10,
+                               $ensure = present,
+                               $label,
+                               $dest
+                              ) {
+	file { "${backupninja::configdir}/${order}_${name}.labelmount":
+		ensure => $ensure,
+		content => template('backupninja/labelmount.conf.erb'),
+		owner => root,
+		group => root,
+		mode => 0600,
+		require => File["${backupninja::configdir}"]
+	}
+
+	file { "${backupninja::configdir}/99_${name}.umount":
+		ensure => $ensure,
+		content => template('backupninja/umount.conf.erb'),
+		owner => root,
+		group => root,
+		mode => 0600,
+		require => File["${backupninja::configdir}"]
+	}
+	
+	# Copy over the handler scripts themselves, since they're not in the
+	# standard distribution, and are unlikely to end up there any time
+	# soon because backupninja's "build" system is balls.
+	file { "/usr/share/backupninja/labelmount":
+		content => template('backupninja/labelmount.handler'),
+		owner => root,
+		group => root,
+		mode => 0755,
+		require => Package[backupninja]
+	}
+
+	file { "/usr/share/backupninja/umount":
+		content => template('backupninja/umount.handler'),
+		owner => root,
+		group => root,
+		mode => 0755,
+		require => Package[backupninja]
+	}
+}
-- 
cgit v1.2.3