Use backport version of the bacula client and drop privs

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 3879e076f78488bc5a0f1bc7f7a9a038f0fe7d20..c445b43c121990b8aa342d2dcf3386797debb0d1 100644 (file)
--- 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 (file)
index 0000000..94ba970
--- /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 (file)
index 0000000..b998713
--- /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"