From 449d6169b8d0c7f31279b445f5dd103b244d7382 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 2 May 2017 16:24:15 -0400
Subject: Install tor from backports (fixes #8783).

The newer version is needed for the single-hop functionality.
---
 puppet/modules/site_tor/manifests/init.pp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp
index 356053c1..5e209ba8 100644
--- a/puppet/modules/site_tor/manifests/init.pp
+++ b/puppet/modules/site_tor/manifests/init.pp
@@ -1,6 +1,14 @@
 # generic configuration needed for tor
 class site_tor {
 
+  # Ensure the tor version is the latest from backports
+  # see https://0xacab.org/leap/platform/issues/8783
+  apt::preferences_snippet { 'tor':
+    package  => 'tor',
+    release  => "${::lsbdistcodename}-backports",
+    priority => 999,
+    before   => Class['tor::daemon']  }
+
   class { 'tor::daemon': ensure_version => latest }
 
 }
-- 
cgit v1.2.3