aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2016-03-11 20:53:08 +0000
committerMicah <micah@riseup.net>2016-03-11 20:53:08 +0000
commitfd7aad3cb5fb7f8db73ef5dbe2cbab9ab4868325 (patch)
treec84e9964aa10f6dd2cd0d64a780a32865b8bcacc
parent396e5d888882a9511df673d51f0af78998ef9b26 (diff)
parent8c936c166b6da1ebd0e8d95e56ceee5167357d63 (diff)
downloadpuppet-tor-master.tar.gz
puppet-tor-master.tar.bz2
Merge branch 'master' into 'master' HEADmaster
Fix deprecated variable references See merge request !3
-rw-r--r--templates/torrc.relay.erb8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index 511bda1..a286459 100644
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -1,11 +1,11 @@
# relay
<% if @port != 0 -%>
ORPort <%= @port %>
-<% listen_addresses.each do |listen_address| -%>
-ORListenAddress <%= listen_address %>
+<% @listen_addresses.each do |listen_address| -%>
+ORListenAddress <%= @listen_address %>
<% end -%>
-<% real_outbound_bindaddresses.each do |outbound_bindaddress| -%>
-OutboundBindAddress <%= outbound_bindaddress %>
+<% @real_outbound_bindaddresses.each do |outbound_bindaddress| -%>
+OutboundBindAddress <%= @outbound_bindaddress %>
<% end -%>
<% if @nickname != '' -%>
Nickname <%= @nickname %>