From e944403f922f0ae19e60747b60cbf2d999496312 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 24 Feb 2014 13:24:44 -0500
Subject: remove safe_mode flag from defaults under Debian (removed from PHP
 5.4 which is in wheezy)

---
 manifests/vhost/php/standard.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'manifests')

diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 53fa8f9..fa6b298 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -122,7 +122,10 @@ define apache::vhost::php::standard(
         upload_tmp_dir => "/var/www/upload_tmp_dir/${name}",
         'session.save_path' => "/var/www/session.save_path/${name}",
         open_basedir => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
-        safe_mode => 'On',
+        safe_mode => $::operatingsystem ? {
+            debian => undef,
+            default => 'On',
+          },
     }
     if $logmode != 'nologs' {
       $std_php_settings[error_log] = "${logdir}/php_error_log"
-- 
cgit v1.2.3