From: Paul Wise <pabs@debian.org>
Date: Tue, 25 Sep 2018 02:27:04 +0000 (+0800)
Subject: Add workaround for new Tor configuration requirement
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=facf99b763703b445104beca01375a6472a5286e;p=mirror%2Fdsa-puppet.git

Add workaround for new Tor configuration requirement

See-also: https://trac.torproject.org/projects/tor/ticket/27849
---

diff --git a/modules/onion/templates/torrc-header.erb b/modules/onion/templates/torrc-header.erb
index b45b81d96..57568154a 100644
--- a/modules/onion/templates/torrc-header.erb
+++ b/modules/onion/templates/torrc-header.erb
@@ -1,4 +1,10 @@
+<%- 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 -%>