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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 2adc16ad2..6235ed3a2 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 }
@@ -80,7 +94,7 @@ class apache2 {
                         notify  => Exec["reload-apache2"];
 
 		"/etc/apache2/sites-available/default-debian.org":
-			content => template("apache2/default-debian.org.erb",
+			content => template("apache2/default-debian.org.erb"),
 			require => Package["apache2"],
                         notify  => Exec["reload-apache2"];
 
@@ -115,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)"
+        }
 }