X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fonion%2Ftemplates%2Ftorrc-header.erb;h=57568154a6e6be223729cfca854974fa81b25238;hb=2fe2b6a194598ca04bebb2ded887e6ffcb3595a3;hp=356431cc045aaeb11481e710d31e1d211bfa5185;hpb=76f92c14deb2ec44e4979494e288d86ab27911ae;p=mirror%2Fdsa-puppet.git

diff --git a/modules/onion/templates/torrc-header.erb b/modules/onion/templates/torrc-header.erb
index 356431cc0..57568154a 100644
--- a/modules/onion/templates/torrc-header.erb
+++ b/modules/onion/templates/torrc-header.erb
@@ -1,9 +1,15 @@
+<%- 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" -%>
-HiddenServiceSingleHopMode 1
-HiddenServiceNonAnonymousMode 1
+<%- if has_variable?("tor_ge_0_2_9") && @tor_ge_0_2_9 -%>
+#HiddenServiceSingleHopMode 1
+#HiddenServiceNonAnonymousMode 1
 <%- end -%>