From 10d96b990af1d680e31c291a15c7b66a6522de89 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 24 Apr 2017 12:04:55 -0400
Subject: git subrepo pull (merge) puppet/modules/tor

subrepo:
  subdir:   "puppet/modules/tor"
  merged:   "5ef29012"
upstream:
  origin:   "https://leap.se/git/puppet_tor"
  branch:   "master"
  commit:   "5ef29012"
git-subrepo:
  version:  "0.4.0"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2e78d5d"
---
 puppet/modules/tor/templates/torrc.hidden_service.erb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'puppet/modules/tor/templates/torrc.hidden_service.erb')

diff --git a/puppet/modules/tor/templates/torrc.hidden_service.erb b/puppet/modules/tor/templates/torrc.hidden_service.erb
index 4dec0b25..5b6afe1c 100644
--- a/puppet/modules/tor/templates/torrc.hidden_service.erb
+++ b/puppet/modules/tor/templates/torrc.hidden_service.erb
@@ -1,3 +1,9 @@
+<% if @single_hop != false %>
+HiddenServiceSingleHopMode 1
+HiddenServiceNonAnonymousMode 1
+SOCKSPort 0
+<% end %>
+
 # hidden service <%= @name %>
 HiddenServiceDir <%= @data_dir %>/<%= @name %>
 <% @ports.each do |port| -%>
-- 
cgit v1.2.3


From 3478b7b46087971f4396de3ea370741694963ca9 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sat, 7 Oct 2017 14:04:02 -0400
Subject: git subrepo pull puppet/modules/tor

subrepo:
  subdir:   "puppet/modules/tor"
  merged:   "4380e2ea"
upstream:
  origin:   "https://leap.se/git/puppet_tor"
  branch:   "master"
  commit:   "4380e2ea"
git-subrepo:
  version:  "0.3.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a7ee886"
---
 puppet/modules/tor/templates/torrc.hidden_service.erb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'puppet/modules/tor/templates/torrc.hidden_service.erb')

diff --git a/puppet/modules/tor/templates/torrc.hidden_service.erb b/puppet/modules/tor/templates/torrc.hidden_service.erb
index 5b6afe1c..8a691c6b 100644
--- a/puppet/modules/tor/templates/torrc.hidden_service.erb
+++ b/puppet/modules/tor/templates/torrc.hidden_service.erb
@@ -10,3 +10,11 @@ HiddenServiceDir <%= @data_dir %>/<%= @name %>
 HiddenServicePort <%= port %>
 <% end -%>
 
+<% if @v3 != false %>
+# hidden service v3 static
+HiddenServiceDir <%= @data_dir %>/<%= @name -%>3
+HiddenServiceVersion 3
+<% @ports.each do |port| -%>
+HiddenServicePort <%= port %>
+<% end -%>
+<% end -%>
-- 
cgit v1.2.3