Split bacula_director_address into bacula_director_address and bacula_director_ip

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 474b22e9265726ea16237ca96b80094ea2cb6205..e7506bffb158ef43d9906b76c03451b74b7c4c5c 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -29,12 +29,12 @@ class bacula::client inherits bacula {
        @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",
        #}
 }

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 5e9550f67c9f4ba2425aa0620acc0b2b9381ffea..f3d6f68ec52e8faba0b72697df5d80b88bc6011d 100644 (file)
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -40,7 +40,7 @@ class bacula::director inherits bacula {
        @ferm::rule { 'dsa-bacula-dir':
                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':

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index bf2ed30d060c739dfff4b425c440911a6cbbc002..76852132ea8171e7b47da4c341708a2efb331e01 100644 (file)
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -10,9 +10,9 @@ class bacula {
        $bacula_filestor_device   = 'FileStorage'
        $bacula_pool_name         = 'debian'
 
-       # $bacula_director_address  = 'dinis.debian.org'
        # use IP address for ferm.
-       $bacula_director_address  = '206.12.19.139'
+       $bacula_director_ip       = '206.12.19.139'
+       $bacula_director_address  = 'dinis.debian.org'
        $bacula_director_port     = 9101
        $bacula_storage_address   = 'beethoven.debian.org'
        $bacula_storage_port      = 9103