stunnel: merge IPv4 and IPv6 rules in a single rule

[mirror/dsa-puppet.git] / modules / stunnel4 / manifests / server.pp

diff --git a/modules/stunnel4/manifests/server.pp b/modules/stunnel4/manifests/server.pp
index d497b94..78111d8 100644 (file)
--- a/modules/stunnel4/manifests/server.pp
+++ b/modules/stunnel4/manifests/server.pp
@@ -9,7 +9,7 @@ define stunnel4::server($accept, $connect, $local = '127.0.0.1') {
 
        include stunnel4
 
-       stunnel::generic { $name:
+       stunnel4::generic { $name:
                client  => false,
                verify  => 2,
                cafile  => '/etc/exim4/ssl/ca.crt',
@@ -18,15 +18,10 @@ define stunnel4::server($accept, $connect, $local = '127.0.0.1') {
                connect => $connect
        }
 
-       @ferm::rule {
+       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)"
-       }
-
 }