actually make case statement useful

[dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 526ec888794d8f5ff1b9dce061c891ca00654a10..bccbd916c53cb9cde36fa6c2b11e44508001a694 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -6,6 +6,14 @@ class apache2 {
                "logrotate": ensure => installed;
        }
 
+        case $php {
+                "true": { package {
+                               "php5-suhosin": ensure => installed;
+                       }
+               }
+       }
+
+
         define activate_apache_site($ensure=present, $site=$name) {
                 case $site {
                         "": { $base = $name }
@@ -58,6 +66,16 @@ 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"),
@@ -80,8 +98,7 @@ class apache2 {
                         notify  => Exec["reload-apache2"];
 
                "/etc/apache2/sites-available/default-debian.org":
-                       source  => [ "puppet:///apache2/per-host/$fqdn/etc/apache2/sites-available/default-debian.org",
-                                    "puppet:///apache2/common/etc/apache2/sites-available/default-debian.org" ],
+                       content => template("apache2/default-debian.org.erb"),
                        require => Package["apache2"],
                         notify  => Exec["reload-apache2"];