X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=4098660c1400260dd8eb3271769a1461ddcfc89d;hb=f1a48dc8cd819d2700a3e96e7c3797bdbc60901c;hp=3084c11480806e6ec770fc965d7fd28641bed85a;hpb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3084c1148..4098660c1 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -9,7 +9,6 @@ class apache2 {
 
     package {
         "apache2": ensure => installed;
-        "logrotate": ensure => installed;
     }
 
     case $php5 {
@@ -161,13 +160,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: