Adding a check on the type of the tunable, so that things like 'notif…

…ication_email' can be set directly and not on a subcomponent.
chef-cookbooks · Feb 13, 2013 · e36882c · e36882c
1 parent a3b94e3
commit e36882c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/templates/default/chef-server.rb.erb b/templates/default/chef-server.rb.erb
@@ -5,8 +5,13 @@ topology "standalone"
 api_fqdn "<%= node['chef-server']['api_fqdn'] %>"
 
 <% node['chef-server']['configuration'].each_pair do |component, tunables| -%>
+<% case tunables -%>
+<% when Hash -%>
 <% tunables.each_pair do |name, value| -%>
 <% value = %Q["#{value}"] if value.kind_of?(String) -%>
 <%= "#{component.gsub("-","_")}['#{name}'] = #{value}" %>
 <% end -%>
+<% when String -%>
+<%= component.gsub('-', '_') %> "<%= tunables %>"
+<% end -%>
 <% end -%>