From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 27 Sep 2019 22:32:19 +0000 (+0200)
Subject: stunnel: merge IPv4 and IPv6 rules in a single rule
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=dd1abc5423b5ee6aea94f94d15fdfeeb2b5596f9

stunnel: merge IPv4 and IPv6 rules in a single rule
---

diff --git a/modules/stunnel4/manifests/server.pp b/modules/stunnel4/manifests/server.pp
index 57a317e0f..78111d8fb 100644
--- a/modules/stunnel4/manifests/server.pp
+++ b/modules/stunnel4/manifests/server.pp
@@ -20,13 +20,8 @@ define stunnel4::server($accept, $connect, $local = '127.0.0.1') {
 
 	ferm::rule {
 		"stunnel-${name}":
+			domain      => "(ip ip6)",
 			description => "stunnel ${name}",
-			rule        => "&SERVICE_RANGE(tcp, ${accept}, \$HOST_DEBIAN_V4)"
+			rule        => "&SERVICE_RANGE(tcp, ${accept}, \$HOST_DEBIAN)"
 	}
-	ferm::rule { "stunnel-${name}-v6":
-			domain      => 'ip6',
-			description => "stunnel ${name}",
-			rule        => "&SERVICE_RANGE(tcp, ${accept}, \$HOST_DEBIAN_V6)"
-	}
-
 }