From 26f56433a57aec688a18a964751cfe08b62d9bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= <pollito@riseup.net>
Date: Wed, 11 Oct 2017 15:35:21 -0400
Subject: puppet 4 needs arrays in templates to be marked as such

---
 templates/torrc.directory.erb      | 2 +-
 templates/torrc.dns.erb            | 2 +-
 templates/torrc.exit_policy.erb    | 4 ++--
 templates/torrc.global.erb         | 2 +-
 templates/torrc.hidden_service.erb | 2 +-
 templates/torrc.relay.erb          | 4 ++--
 templates/torrc.socks.erb          | 4 ++--
 templates/torrc.transparent.erb    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/torrc.directory.erb b/templates/torrc.directory.erb
index c7dc4ab..2eaffb7 100644
--- a/templates/torrc.directory.erb
+++ b/templates/torrc.directory.erb
@@ -2,7 +2,7 @@
 <%  if @port != '0' -%>
 DirPort <%= @port %>
 <%  end -%>
-<%  listen_addresses.each do |listen_address| -%>
+<%  Array(listen_addresses).each do |listen_address| -%>
 DirListenAddress <%= listen_address %>
 <%  end -%>
 <%  if @port_front_page != '' -%>
diff --git a/templates/torrc.dns.erb b/templates/torrc.dns.erb
index 57cf46d..2b9ff8e 100644
--- a/templates/torrc.dns.erb
+++ b/templates/torrc.dns.erb
@@ -1,5 +1,5 @@
 # DNS
 DNSPort <%= @port %>
-<% @listen_addresses.each do |listen_address|  -%>
+<% Array(@listen_addresses).each do |listen_address|  -%>
 DNSListenAddress <%= listen_address %>
 <% end -%>
diff --git a/templates/torrc.exit_policy.erb b/templates/torrc.exit_policy.erb
index a30d43b..5481914 100644
--- a/templates/torrc.exit_policy.erb
+++ b/templates/torrc.exit_policy.erb
@@ -2,10 +2,10 @@
 <% if @reject_private != '1' -%>
 ExitPolicyRejectPrivate <%= @reject_private %>
 <% end -%>
-<% @accept.each do |policy| -%>
+<% Array(@accept).each do |policy| -%>
 ExitPolicy accept <%= policy %>
 <% end -%>
-<% @reject.each do |policy| -%>
+<% Array(@reject).each do |policy| -%>
 ExitPolicy reject <%= policy %>
 <% end -%>
 
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb
index a02afc8..c29b76b 100644
--- a/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@ -8,7 +8,7 @@ DataDirectory <%= v %>
 <% if (rules=scope.lookupvar('tor::daemon::log_rules')).empty? -%>
 Log notice syslog
 <%  else -%>
-<%   rules.each do |log_rule| -%>
+<%   Array(rules).each do |log_rule| -%>
 Log <%= log_rule %>
 <%    end -%>
 <%  end -%>
diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb
index 5b6afe1..6672937 100644
--- a/templates/torrc.hidden_service.erb
+++ b/templates/torrc.hidden_service.erb
@@ -6,7 +6,7 @@ SOCKSPort 0
 
 # hidden service <%= @name %>
 HiddenServiceDir <%= @data_dir %>/<%= @name %>
-<% @ports.each do |port| -%>
+<% Array(@ports).each do |port| -%>
 HiddenServicePort <%= port %>
 <% end -%>
 
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index a286459..bfe982c 100644
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -1,10 +1,10 @@
 # relay
 <% if @port != 0 -%>
 ORPort <%= @port %>
-<%   @listen_addresses.each do |listen_address| -%>
+<%   Array(@listen_addresses).each do |listen_address| -%>
 ORListenAddress <%= @listen_address %>
 <%   end -%>
-<%   @real_outbound_bindaddresses.each do |outbound_bindaddress| -%>
+<%   Array(@real_outbound_bindaddresses).each do |outbound_bindaddress| -%>
 OutboundBindAddress <%= @outbound_bindaddress %>
 <%   end -%>
 <%   if @nickname != '' -%>
diff --git a/templates/torrc.socks.erb b/templates/torrc.socks.erb
index 4bc3ddc..09e13ae 100644
--- a/templates/torrc.socks.erb
+++ b/templates/torrc.socks.erb
@@ -1,9 +1,9 @@
 # socks
 SocksPort <%= @port %>
-<% @listen_addresses.each do |listen_address| -%>
+<% Array(@listen_addresses).each do |listen_address| -%>
 SocksListenAddress <%= listen_address %>
 <% end -%>
-<% @policies.each do |policy| -%>
+<% Array(@policies).each do |policy| -%>
 SocksPolicy <%= policy %>
 <% end -%>
 
diff --git a/templates/torrc.transparent.erb b/templates/torrc.transparent.erb
index c683150..19a40e1 100644
--- a/templates/torrc.transparent.erb
+++ b/templates/torrc.transparent.erb
@@ -1,5 +1,5 @@
 # Transparent proxy
 TransPort <%= @port %>
-<% @listen_addresses.each do |listen_address| -%>
+<% Array(@listen_addresses).each do |listen_address| -%>
 TransListenAddress <%= listen_address %>
 <% end -%>
-- 
cgit v1.2.3