summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Bode <dan@bodepd.com>2011-12-04 11:28:30 -0800
committerDan Bode <dan@bodepd.com>2011-12-04 11:28:30 -0800
commit165dfc4558a5aab84d233c4f2a4637b59ed5591d (patch)
treeb548680ae32945e5ecaf3c1d97e64a85359c9e01
parent7d0a1e564f73c23ea2ca4d134b3a319598243c29 (diff)
parent61f3572b91b7b91dfd85c9fb576b4088caf335d7 (diff)
Merge pull request #10 from kbarber/ticket/11155-ruby-1.9.2_compatibility
(#11155) Fix templates so they are ruby-1.9.2 compatible
-rw-r--r--templates/ntp.conf.debian.erb2
-rw-r--r--templates/ntp.conf.el.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/ntp.conf.debian.erb b/templates/ntp.conf.debian.erb
index f51414f..77da814 100644
--- 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
index db2aa9c..fc308cc 100644
--- 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 -%>