Fix bugs_mirror role include for beach

[mirror/dsa-puppet.git] / modules / onion / templates / torrc-header.erb

diff --git a/modules/onion/templates/torrc-header.erb b/modules/onion/templates/torrc-header.erb
index 2978f62..5756815 100644 (file)
--- 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 -%>