From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 3 Jul 2019 06:08:08 +0000 (+0200)
Subject: Force HiddenServiceVersion 2 as that is the only thing onionbalance understands
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f9bbb8445cd30752a5763ebf25f0e648c1142d69;p=mirror%2Fdsa-puppet.git

Force HiddenServiceVersion 2 as that is the only thing onionbalance understands
---

diff --git a/modules/onion/manifests/service.pp b/modules/onion/manifests/service.pp
index 77ecc8927..01f55312a 100644
--- a/modules/onion/manifests/service.pp
+++ b/modules/onion/manifests/service.pp
@@ -20,7 +20,12 @@ define onion::service (
 		concat::fragment { "onion::torrc_onionservice::${name}":
 			target  => "/etc/tor/torrc",
 			order   => '50',
-			content => "HiddenServiceDir /var/lib/tor/onion/${name}\nHiddenServicePort ${port} ${target_address}:${target_port}\n\n",
+			content  => @("EOF"),
+				HiddenServiceDir /var/lib/tor/onion/${name}
+				HiddenServicePort ${port} ${target_address}:${target_port}
+				HiddenServiceVersion 2
+
+				| EOF
 		}
 
 		$onion_hn = onion_tor_service_hostname($name)