From 054c5311fbe235033e325bf68637615d581355aa Mon Sep 17 00:00:00 2001
From: guido <guido@dis.tur.bio>
Date: Wed, 21 Dec 2016 21:16:12 -0300
Subject: support for single_hop onion services added

---
 manifests/daemon/hidden_service.pp | 10 ++++------
 templates/torrc.hidden_service.erb |  5 +++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp
index c827211..b082fe8 100644
--- a/manifests/daemon/hidden_service.pp
+++ b/manifests/daemon/hidden_service.pp
@@ -1,15 +1,13 @@
 # hidden services definition
 define tor::daemon::hidden_service(
-  $ports    = [],
-  $data_dir = $tor::daemon::data_dir,
-  $ensure   = present ) {
+  $ports      = [],
+  $single_hop = false,
+  $data_dir   = $tor::daemon::data_dir,
+  $ensure     = present ) {
 
   concat::fragment { "05.hidden_service.${name}":
     ensure  => $ensure,
     content => template('tor/torrc.hidden_service.erb'),
-    owner   => 'debian-tor',
-    group   => 'debian-tor',
-    mode    => '0644',
     order   => 05,
     target  => $tor::daemon::config_file,
   }
diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb
index 4dec0b2..dec126d 100644
--- a/templates/torrc.hidden_service.erb
+++ b/templates/torrc.hidden_service.erb
@@ -1,5 +1,10 @@
 # hidden service <%= @name %>
 HiddenServiceDir <%= @data_dir %>/<%= @name %>
+<% if @single_hop != false %>
+HiddenServiceNonAnonymousMode 1
+<% else %> 
+HiddenServiceNonAnonymousMode 0
+<% end %>
 <% @ports.each do |port| -%>
 HiddenServicePort <%= port %>
 <% end -%>
-- 
cgit v1.2.3


From 46ceed3ff73a9f33264eef179b0e2a9cf92ad151 Mon Sep 17 00:00:00 2001
From: guido <guido@dis.tur.bio>
Date: Thu, 22 Dec 2016 00:28:32 -0300
Subject: Tor's missing config for single hop

---
 manifests/daemon/hidden_service.pp | 18 ++++++++++++++----
 templates/torrc.hidden_service.erb |  9 +++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp
index b082fe8..b77b790 100644
--- a/manifests/daemon/hidden_service.pp
+++ b/manifests/daemon/hidden_service.pp
@@ -1,9 +1,16 @@
 # hidden services definition
 define tor::daemon::hidden_service(
-  $ports      = [],
-  $single_hop = false,
-  $data_dir   = $tor::daemon::data_dir,
-  $ensure     = present ) {
+  $ports         = [],
+  $single_hop    = false,
+  $data_dir      = $tor::daemon::data_dir,
+  $ensure        = present ) {
+
+
+  if $single_hop {
+    file { "${$data_dir}/${$name}/onion_service_non_anonymous":
+      ensure => 'present',
+    }
+  }
 
   concat::fragment { "05.hidden_service.${name}":
     ensure  => $ensure,
@@ -11,5 +18,8 @@ define tor::daemon::hidden_service(
     order   => 05,
     target  => $tor::daemon::config_file,
   }
+
+  
+
 }
 
diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb
index dec126d..5b6afe1 100644
--- a/templates/torrc.hidden_service.erb
+++ b/templates/torrc.hidden_service.erb
@@ -1,10 +1,11 @@
-# hidden service <%= @name %>
-HiddenServiceDir <%= @data_dir %>/<%= @name %>
 <% if @single_hop != false %>
+HiddenServiceSingleHopMode 1
 HiddenServiceNonAnonymousMode 1
-<% else %> 
-HiddenServiceNonAnonymousMode 0
+SOCKSPort 0
 <% end %>
+
+# hidden service <%= @name %>
+HiddenServiceDir <%= @data_dir %>/<%= @name %>
 <% @ports.each do |port| -%>
 HiddenServicePort <%= port %>
 <% end -%>
-- 
cgit v1.2.3


From 9c7d45201a81d46d2cb829d4eab5d3d65d0c4d88 Mon Sep 17 00:00:00 2001
From: guido <guido@dis.tur.bio>
Date: Fri, 10 Feb 2017 18:11:16 -0300
Subject: removed spaces not needed

---
 manifests/daemon/hidden_service.pp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp
index b77b790..07121bd 100644
--- a/manifests/daemon/hidden_service.pp
+++ b/manifests/daemon/hidden_service.pp
@@ -18,8 +18,4 @@ define tor::daemon::hidden_service(
     order   => 05,
     target  => $tor::daemon::config_file,
   }
-
-  
-
 }
-
-- 
cgit v1.2.3