Merge pull request #483 from joshuaspence/clearenv

Allow `clear_env` to be disabled

manifests/fpm/pool.pp

@@ -88,6 +88,9 @@
 #   Hash of environment variables and values as strings to use in php
 #   scripts in this pool
 #
+# [*clear_env*]
+#   Whether the environment should be cleared.
+#
 # [*options*]
 #   An optional hash for any other data.
 #
@@ -149,6 +152,7 @@
   $include                                 = undef,
   $env                                     = [],
   $env_value                               = {},
+  $clear_env                               = true,
   $options                                 = {},
   $php_value                               = {},
   $php_flag                                = {},

templates/fpm/pool.conf.erb

@@ -304,6 +304,7 @@ include=<%= @include %>
 ;env[TMP] = /tmp
 ;env[TMPDIR] = /tmp
 ;env[TEMP] = /tmp
+<% if @clear_env -%>
 <% @env.each do |var| -%>
 env[<%= var %>] = $<%= var %>
 <% end -%>
@@ -312,6 +313,9 @@ env[<%= var %>] = $<%= var %>
 env[<%= key %>] = '<%= value %>'
 <% end -%>
 <% end -%>
+<% else -%>
+clear_env = no
+<% end -%>
 
 ; Additional php.ini defines, specific to this pool of workers. These settings
 ; overwrite the values previously defined in the php.ini. The directives are the