Merge branch 'salsa' into fordsa

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

diff --git a/modules/stunnel4/manifests/server.pp b/modules/stunnel4/manifests/server.pp
index 57a317e..78111d8 100644 (file)
--- 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)"
-       }
-
 }