Split bacula_director_address into bacula_director_address and bacula_director_ip

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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index b48eedcb9283005f3f9a6d7bbe2abbd7df0e8c61..f3d6f68ec52e8faba0b72697df5d80b88bc6011d 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,5 +1,4 @@
 class bacula::director inherits bacula {
-       bacula::node { $::fqdn: }
 
        package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']:
                ensure => installed
@@ -12,6 +11,13 @@ class bacula::director inherits bacula {
                require   => Package['bacula-director-pgsql']
        }
 
+       exec { 'bacula-director reload':
+               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+               command     => 'service bacula-director reload',
+               refreshonly => true,
+        }
+
+
        file { '/etc/bacula/conf.d':
                ensure  => directory,
                mode    => '0755',
@@ -20,7 +26,7 @@ class bacula::director inherits bacula {
                force   => true,
                recurse => true,
                source  => 'puppet:///files/empty/',
-               notify  => Service['bacula-director']
+               notify  => Exec['bacula-director reload']
        }
 
        file { '/etc/bacula/bacula-dir.conf':
@@ -28,13 +34,13 @@ class bacula::director inherits bacula {
                mode    => '0440',
                group   => bacula,
                require => Package['bacula-director-pgsql'],
-               notify  => Service['bacula-director']
+               notify  => Exec['bacula-director reload']
        }
 
        @ferm::rule { 'dsa-bacula-dir':
-               domain      => '(ip ip6)',
+               domain      => '(ip)',
                description => 'Allow bacula access from localhost',
-               rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
+               rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_ip} localhost) ACCEPT",
        }
 
        file { '/etc/bacula/conf.d/empty.conf':
@@ -42,7 +48,7 @@ class bacula::director inherits bacula {
                mode    => '0440',
                group   => bacula,
                require => Package['bacula-director-pgsql'],
-               notify  => Service['bacula-director']
+               notify  => Exec['bacula-director reload']
        }
 
        Bacula::Node<<| |>>