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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index bccbd916c..6235ed3a2 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -6,10 +6,16 @@ class apache2 {
 		"logrotate": ensure => installed;
 	}
 
-        case $php {
+        case $php5 {
                 "true": { package {
 				"php5-suhosin": ensure => installed;
 			}
+                          file { "/etc/php5/conf.d/suhosin.ini":
+					source  => [ "puppet:///apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini",
+					             "puppet:///apache2/common/etc/php5/conf.d/suhosin.ini" ],
+					require => Package["apache2", "php5-suhosin"],
+                                        notify  => Exec["force-reload-apache2"];
+			}
 		}
 	}
 
@@ -66,16 +72,6 @@ class apache2 {
                 "000-default": ensure => absent;
         }
 
-        case $php5suhosin {
-                "true": { file { "/etc/php5/conf.d/suhosin.ini":
-					source  => [ "puppet:///apache2/per-host/$fqdn/etc/php5/conf.d/suhosin.ini",
-					             "puppet:///apache2/common/etc/php5/conf.d/suhosin.ini" ],
-					require => Package["apache2", "php5-suhosin"],
-                                        notify  => Exec["force-reload-apache2"];
-                               }
-                 }
-        }
-
 	file {
 		"/etc/apache2/conf.d/ressource-limits":
 			content => template("apache2/ressource-limits.erb"),
@@ -133,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)"
+        }
 }