X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=3027930adc77228aed9cfd58b4eeb2b9995177cc;hb=29cbe59430d1e7d7d5575579b48513c56227e2f7;hp=580115d6dfcabfb65ad6acdf59421b5979487ad3;hpb=8231709362826b0d862990e7a6b54b4cb2d7f6a7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 580115d6d..3027930ad 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -63,7 +63,7 @@ class bacula::client inherits bacula {
 		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
 			ensure	=> absent,
 		}
-		systemd::override { 'bacula-fd':
+		dsa_systemd::override { 'bacula-fd':
 			content => @(EOT)
 				[Service]
 				ExecStart=
@@ -74,20 +74,14 @@ class bacula::client inherits bacula {
 		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
 			ensure	=> absent,
 		}
-		systemd::override { 'bacula-fd':
+		dsa_systemd::override { 'bacula-fd':
 			ensure	=> absent,
 		}
 	}
 
-	@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",
+		rule        => "proto tcp mod state state (NEW) dport (${bacula_client_port}) saddr (${bacula_director_ip_addrs}) 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",
-	#}
 }