From 0c709a0ee0080cf3ce60f4c17b02c3c65bd07ce4 Mon Sep 17 00:00:00 2001
From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 21 Sep 2012 22:55:11 +0200
Subject: [PATCH] Use backport version of the bacula client and drop privs

---
 modules/bacula/manifests/client.pp                | 15 +++++++++++++++
 .../templates/apt.preferences.bacula-client.erb   |  3 +++
 modules/bacula/templates/default.bacula-fd.erb    | 13 +++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 modules/bacula/templates/apt.preferences.bacula-client.erb
 create mode 100644 modules/bacula/templates/default.bacula-fd.erb

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 3879e076f..c445b43c1 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -29,6 +29,21 @@ class bacula::client inherits bacula {
 			mode    => '0775',
 			source  => 'puppet:///modules/bacula/postbaculajob',
 			;
+		'/etc/default/bacula-fd':
+			content => template('bacula/default.bacula-fd.erb'),
+			mode    => '0400',
+			owner   => root,
+			group   => root,
+			require => Package['bacula-fd'],
+			notify  => Service['bacula-fd'],
+			;
+		'/etc/apt/preferences.d/dsa-bacula-client':
+			content => template('apt.preferences.bacula-client.erb'),
+			mode    => '0444',
+			owner   => root,
+			group   => root,
+			;
+
 	}
 
 	@ferm::rule { 'dsa-bacula-fd-v4':
diff --git a/modules/bacula/templates/apt.preferences.bacula-client.erb b/modules/bacula/templates/apt.preferences.bacula-client.erb
new file mode 100644
index 000000000..94ba9701f
--- /dev/null
+++ b/modules/bacula/templates/apt.preferences.bacula-client.erb
@@ -0,0 +1,3 @@
+Package: bacula-fd bacula-common
+Pin: release n=squeeze-backports
+Pin-Priority: 500
diff --git a/modules/bacula/templates/default.bacula-fd.erb b/modules/bacula/templates/default.bacula-fd.erb
new file mode 100644
index 000000000..b998713f7
--- /dev/null
+++ b/modules/bacula/templates/default.bacula-fd.erb
@@ -0,0 +1,13 @@
+# defaults file for bacula-fd
+
+# Service can be disabled by setting
+# ENABLED="no"
+ENABLED="yes"
+
+# Additional start arguments can be provided here
+# ARGS=""
+ARGS="-u bacula -k"
+
+# Default config file can be changed here
+# CONFIG="/etc/bacula/bacula-fd.conf"
+CONFIG="/etc/bacula/bacula-fd.conf"
-- 
2.20.1