X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=6235ed3a212e7e3edb621e667b12ca7e0d8b3b1c;hb=1d9cc3ed9353b6eb7202ad68b7cd1f292a3579e6;hp=f58b71052f40bdefc35c45c73f222738f47bfb7a;hpb=cb1cd6c04051d3ccb7ed74112e9019dcc5f22b8b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index f58b71052..6235ed3a2 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -6,7 +6,7 @@ class apache2 {
 		"logrotate": ensure => installed;
 	}
 
-        case $php {
+        case $php5 {
                 "true": { package {
 				"php5-suhosin": ensure => installed;
 			}
@@ -129,4 +129,9 @@ class apache2 {
                command => "/etc/init.d/apache2 force-reload",
                refreshonly => true,
 	}
+        @ferm::rule { "dsa-apache":
+                domain          => "(ip ip6)",
+                description     => "Allow web access",
+                rule            => "&SERVICE(tcp, 80)"
+        }
 }