From: Stephen Gran <steve@lobefin.net>
Date: Sun, 7 Mar 2010 21:38:56 +0000 (+0000)
Subject: add https ferm rule to apache class for now
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=847888755f033c91fc7a9f7c8bf8eda012f22641;p=mirror%2Fdsa-puppet.git

add https ferm rule to apache class for now

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3084c1148..a0e810615 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -161,13 +161,13 @@ class apache2 {
     @ferm::rule { "dsa-http":
         prio            => "23",
         description     => "Allow web access",
-        rule            => "proto tcp dport http jump http;"
+        rule            => "proto tcp dport (http https) jump http;"
     }
     @ferm::rule { "dsa-http-v6":
         domain          => "(ip6)",
         prio            => "23",
         description     => "Allow web access",
-        rule            => "&SERVICE(tcp, 80)"
+        rule            => "&SERVICE(tcp, (http https))"
     }
 }
 # vim:set et: