X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fonion%2Ftemplates%2Ftorrc-header.erb;h=57568154a6e6be223729cfca854974fa81b25238;hb=9a1fd5f05a8593ae282383bbace383992cb720ff;hp=845adbfd9c08e3ceec29f7a89d2ba336fcb56fd5;hpb=5f26d5fc2d8032835e93b63366eecc5d65a2b568;p=mirror%2Fdsa-puppet.git diff --git a/modules/onion/templates/torrc-header.erb b/modules/onion/templates/torrc-header.erb index 845adbfd9..57568154a 100644 --- a/modules/onion/templates/torrc-header.erb +++ b/modules/onion/templates/torrc-header.erb @@ -1,7 +1,13 @@ +<%- if scope.function_has_role(['onionbalance']) -%> +# Workaround https://trac.torproject.org/projects/tor/ticket/27849 +# FIXME: remove this when the bug is fixed +SocksPort 9050 +<%- else -%> SocksPort 0 +<%- end -%> Log notice syslog -<%- if has_variable?("tor_ge_0_2_9") && tor_ge_0_2_9 == "true" -%> +<%- if has_variable?("tor_ge_0_2_9") && @tor_ge_0_2_9 -%> #HiddenServiceSingleHopMode 1 #HiddenServiceNonAnonymousMode 1 <%- end -%>