Use backport version of the bacula client and drop privs

[dsa-puppet.git] / modules / bacula / manifests / client.pp

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 474b22e9265726ea16237ca96b80094ea2cb6205..c445b43c121990b8aa342d2dcf3386797debb0d1 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,4 +1,9 @@
 class bacula::client inherits bacula {
+       @@bacula::storage-per-node { $::fqdn: }
+
+       if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
+               @@bacula::node { $::fqdn: }
+       }
 
        package { ['bacula-fd']:
                ensure => installed
@@ -24,17 +29,32 @@ 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':
                domain      => '(ip)',
                description => 'Allow bacula access from storage and director',
-               rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_address}) ACCEPT",
+               rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip}) ACCEPT",
        }
 
        #@ferm::rule { 'dsa-bacula-fd-v6':
        #       domain      => '(ip6)',
        #       description => 'Allow bacula access from storage and director',
-       #       rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_address}) ACCEPT",
+       #       rule        => "proto tcp mod state state (NEW) dport (bacula-fd) saddr (${bacula_director_ip6}) ACCEPT",
        #}
 }