X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=03f29bd17d07c1099272aec036ba0c4aecc0e961;hb=446a74676ae69d25525215b8f57158d71e5a47f6;hp=9c5481cc4f071f48137f648415078a629928453f;hpb=9238b1df481938b60dba7955887ed505d2b00ce3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 9c5481cc4..03f29bd17 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -6,6 +6,20 @@ class apache2 {
 		"logrotate": ensure => installed;
 	}
 
+        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"];
+			}
+		}
+	}
+
+
         define activate_apache_site($ensure=present, $site=$name) {
                 case $site {
                         "": { $base = $name }
@@ -58,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"),
@@ -125,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            => "proto tcp mod state state (NEW) dport (80) ACCEPT"
+        }
 }