Fix correct type for php_admin and sort hash

xbezdick · Sep 15, 2014 · aa4d07a · aa4d07a
1 parent eb191cb
commit aa4d07a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -59,8 +59,8 @@
   $suphp_addhandler            = $::apache::params::suphp_addhandler,
   $suphp_engine                = $::apache::params::suphp_engine,
   $suphp_configpath            = $::apache::params::suphp_configpath,
-  $php_admin_flags             = [],
-  $php_admin_values            = [],
+  $php_admin_flags             = {},
+  $php_admin_values            = {},
   $no_proxy_uris               = [],
   $proxy_preserve_host         = false,
   $redirect_source             = '/',

diff --git a/templates/vhost/_php_admin.erb b/templates/vhost/_php_admin.erb
@@ -1,10 +1,10 @@
 <% if @php_admin_values and not @php_admin_values.empty? -%>
-  <%- @php_admin_values.each do |key,value| -%>
+  <%- @php_admin_values.sort.each do |key,value| -%>
   php_admin_value <%= key %> <%= value %>
   <%- end -%>
 <% end -%>
 <% if @php_admin_flags and not @php_admin_flags.empty? -%>
-  <%- @php_admin_flags.each do |key,flag| -%>
+  <%- @php_admin_flags.sort.each do |key,flag| -%>
     <%-# normalize flag -%>
     <%- if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
   php_admin_flag <%= key %> <%= flag %>