Merge pull request #10 from kbarber/ticket/11155-ruby-1.9.2_compatibi…

…lity (#11155) Fix templates so they are ruby-1.9.2 compatible
puppetlabs · Dec 4, 2011 · 165dfc4 · 165dfc4
2 parents 7d0a1e5 + 61f3572
commit 165dfc4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/templates/ntp.conf.debian.erb b/templates/ntp.conf.debian.erb
@@ -20,7 +20,7 @@ filegen clockstats file clockstats type day enable
 # pool: <http://www.pool.ntp.org/join.html>
 
 # Managed by puppet class { "ntp": servers => [ ... ] }
-<% servers_real.each do |server| -%>
+<% [servers_real].flatten.each do |server| -%>
 server <%= server %>
 <% end -%>
 

diff --git a/templates/ntp.conf.el.erb b/templates/ntp.conf.el.erb
@@ -16,7 +16,7 @@ restrict -6 ::1
 # Please consider joining the pool (http://www.pool.ntp.org/join.html).
 
 # Managed by puppet class { "ntp": servers => [ ... ] }
-<% servers_real.each do |server| -%>
+<% [servers_real].flatten.each do |server| -%>
 server <%= server %>
 <% end -%>