gistfile1.diff

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 0f12ece..5016a53 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -22,7 +22,7 @@ define apache::vhost(
     $php_session_save_path = 'absent',
     $php_use_smarty = false,
     $php_use_pear = false,
-    $php_safe_mode = true,
+    $php_admin_flags = [],
     $cgi_binpath = 'absent',
     $default_charset = 'absent',
     $do_includes = false,
@@ -72,7 +72,7 @@ define apache::vhost(
                 default_charset => $default_charset,
                 php_use_smarty => $php_use_smarty,
                 php_use_pear => $php_use_pear,
-                php_safe_mode => $php_safe_mode,
+                php_admin_flags => $php_admin_flags,
                 run_mode => $run_mode,
                 run_uid => $run_uid,
                 run_gid => $run_gid,
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 2518962..31f55a0 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -26,7 +26,7 @@ define apache::vhost::php::standard(
     $php_session_save_path = 'absent',
     $php_use_smarty = false,
     $php_use_pear = false,
-    $php_safe_mode = true,
+    $php_admin_flags = [],
     $do_includes = false,
     $options = 'absent',
     $additional_options = 'absent',
@@ -94,7 +94,7 @@ define apache::vhost::php::standard(
         php_session_save_path => $php_session_save_path,
         php_use_smarty => $php_use_smarty,
         php_use_pear => $php_use_pear,
-        php_safe_mode => $php_safe_mode,
+        php_admin_flags => $php_admin_flags,
         ssl_mode => $ssl_mode,
         htpasswd_file => $htpasswd_file,
         htpasswd_path => $htpasswd_path,
diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp
index d6881b0..b5f63ee 100644
--- a/manifests/vhost/template.pp
+++ b/manifests/vhost/template.pp
@@ -33,7 +33,7 @@ define apache::vhost::template(
     $default_charset = 'absent',
     $php_use_smarty = false,
     $php_use_pear = false,
-    $php_safe_mode = true,
+    $php_admin_flags = [],
     $run_mode = 'normal',
     $run_uid = 'absent',
     $run_gid = 'absent',
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb
index bf15796..5f9a3d9 100644
--- a/templates/vhosts/php/CentOS.erb
+++ b/templates/vhosts/php/CentOS.erb
@@ -39,8 +39,8 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
-        <%- if php_safe_mode.to_s == 'false' -%>
-        php_admin_flag safe_mode Off
+        <%- if php_admin_flags.to_a.each do |admin_flag| -%>
+        php_admin_flag <%- admin_flag -%>
         <%- end -%>
         php_admin_value open_basedir <%- if php_use_smarty.to_s == 'true' -%>/usr/share
         php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %>
@@ -105,8 +105,8 @@
         require valid-user
         <%- end -%>
         php_admin_flag engine on
-        <%- if php_safe_mode.to_s == 'false' -%>
-        php_admin_flag safe_mode Off
+        <%- php_admin_flags.to_a.each do |admin_flag|-%>
+        php_admin_flag <%- admin_flag -%>
         <%- end -%>
         php_admin_value open_basedir <%- if php_use_smarty.to_s == 'true' -%>/usr/share
         php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %>