aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-04-26 16:56:35 +0200
committerintrigeri <intrigeri@boum.org>2012-04-26 17:21:48 +0200
commit8e0dbb0d9d903fbf89e4263cd29c1b1a7d597075 (patch)
tree848034bc3ea87ec7058690c2396007ac13163a0c /templates
parent7bf57976706f73881d18bbaea0e7f87b7f1c3b40 (diff)
downloadpuppet-tor-8e0dbb0d9d903fbf89e4263cd29c1b1a7d597075.tar.gz
puppet-tor-8e0dbb0d9d903fbf89e4263cd29c1b1a7d597075.tar.bz2
Fix the relay define's outbound_bindaddresses default value setting.
Apparently, we have no guarantee $outbound_bindaddresses's value is set *after* $listen_addresses is, so (at least on my setup) it ends up being undef, and then the template parsing fails: err: Could not retrieve catalog from remote server: Error 400 on SERVER: Failed to parse template tor/torrc.relay.erb: undefined method `each' for :undef:Symbol at /etc/puppet/modules/tor/manifests/daemon.pp:117 So, let's set $real_outbound_bindaddresses to $listen_addresses in the define body, as needed.
Diffstat (limited to 'templates')
-rw-r--r--templates/torrc.relay.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index 2ab34bf..990dfcc 100644
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -4,7 +4,7 @@ ORPort <%= port %>
<%- for listen_address in listen_addresses -%>
ORListenAddress <%= listen_address %>
<%- end -%>
-<%- for outbound_bindaddress in outbound_bindaddresses -%>
+<%- for outbound_bindaddress in real_outbound_bindaddresses -%>
OutboundBindAddress <%= outbound_bindaddress %>
<%- end -%>
<%- if nickname != '' then -%>