From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Sep 2019 08:11:59 +0000 (+0200)
Subject: apache2: merge ipv4 and ipv6 ferm rule
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d88b26cb9fad29c6f0d42b21889ecc55d5e766bb;p=mirror%2Fdsa-puppet.git

apache2: merge ipv4 and ipv6 ferm rule
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 283ce50e9..718f02b5d 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -148,13 +148,7 @@ class apache2(
       include apache2::dynamic
     } else {
       ferm::rule { 'dsa-http':
-        prio        => '23',
-        description => 'Allow web access',
-        rule        => '&SERVICE(tcp, (http https))'
-      }
-
-      ferm::rule { 'dsa-http-v6':
-        domain      => '(ip6)',
+        domain      => '(ip ip6)',
         prio        => '23',
         description => 'Allow web access',
         rule        => '&SERVICE(tcp, (http https))'