X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=8c33181b2f43d16cc7cec27268d1b2ec7d52fdc7;hb=b0a49d0c8c18d1f3436b89c5ff5d17419e2e39f0;hp=f8f83f202b59817ab757197d6fe697514ab61741;hpb=91259d8d44b9568967cc7773f203a7f108e4512c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index f8f83f202..8c33181b2 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -5,6 +5,14 @@ class bacula::client inherits bacula {
 		@@bacula::node { $::fqdn:
 			bacula_client_port => $bacula::bacula_client_port,
 		}
+
+		@@concat::fragment { "bacula-dsa-client-list::$fqdn":
+			target => $bacula::bacula_dsa_client_list ,
+			content  => @("EOF"),
+					${fqdn}
+					| EOF
+			tag     => $bacula::tag_bacula_dsa_client_list,
+		}
 	}
 
 	package { ['bacula-fd']:
@@ -71,23 +79,9 @@ class bacula::client inherits bacula {
 		}
 	}
 
-	@ferm::rule { 'dsa-bacula-fd-v4':
-		domain      => '(ip)',
+	@ferm::rule { 'dsa-bacula-fd':
+		domain      => '(ip ip6)',
 		description => 'Allow bacula access from storage and director',
-		rule        => "proto tcp mod state state (NEW) dport (${bacula_client_port}) 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_ip6}) ACCEPT",
-	#}
-
-	@@concat::fragment { "bacula-dsa-client-list::$fqdn":
-		target => $bacula::bacula_dsa_client_list ,
-		content  => @("EOF"),
-				${fqdn}
-				| EOF
-		tag     => $bacula::tag_bacula_dsa_client_list,
+		rule        => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip_addrs}) ACCEPT",
 	}
 }