Split bacula_director_address into bacula_director_address and bacula_director_ip

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 94610a2e8b4ffc04e713abdcf629ca622b4cb775..e7506bffb158ef43d9906b76c03451b74b7c4c5c 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -11,24 +11,30 @@ class bacula::client inherits bacula {
                require   => Package['bacula-fd']
        }
 
-       file { '/etc/bacula/bacula-fd.conf':
-               content => template('bacula/bacula-fd.conf.erb'),
-               mode    => '0640',
-               owner   => root,
-               group   => bacula,
-               require => Package['bacula-fd'],
-               notify  => Service['bacula-fd']
+       file {
+               '/etc/bacula/bacula-fd.conf':
+                       content => template('bacula/bacula-fd.conf.erb'),
+                       mode    => '0640',
+                       owner   => root,
+                       group   => bacula,
+                       require => Package['bacula-fd'],
+                       notify  => Service['bacula-fd'],
+                       ;
+               '/usr/local/sbin/postbaculajob':
+                       mode    => '0775',
+                       source  => 'puppet:///modules/bacula/postbaculajob',
+                       ;
        }
 
        @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",
-       }
+       #@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_ip6}) ACCEPT",
+       #}
 }