From 30856dc322bf75ad5120d6c780007e6b0877b688 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 24 Aug 2012 11:02:32 +0200 Subject: [PATCH 1/1] Split bacula_director_address into bacula_director_address and bacula_director_ip --- modules/bacula/manifests/client.pp | 4 ++-- modules/bacula/manifests/director.pp | 2 +- modules/bacula/manifests/init.pp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp index 474b22e9..e7506bff 100644 --- 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 5e9550f6..f3d6f68e 100644 --- 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 bf2ed30d..76852132 100644 --- 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 -- 2.39.2