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/manifests/daemon/hidden_service.pp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'puppet/modules/tor/manifests/daemon/hidden_service.pp')

diff --git a/puppet/modules/tor/manifests/daemon/hidden_service.pp b/puppet/modules/tor/manifests/daemon/hidden_service.pp
index c8272116..07121bd6 100644
--- a/puppet/modules/tor/manifests/daemon/hidden_service.pp
+++ b/puppet/modules/tor/manifests/daemon/hidden_service.pp
@@ -1,17 +1,21 @@
 # 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 ) {
+
+
+  if $single_hop {
+    file { "${$data_dir}/${$name}/onion_service_non_anonymous":
+      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,
   }
 }
-
-- 
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/manifests/daemon/hidden_service.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'puppet/modules/tor/manifests/daemon/hidden_service.pp')

diff --git a/puppet/modules/tor/manifests/daemon/hidden_service.pp b/puppet/modules/tor/manifests/daemon/hidden_service.pp
index 07121bd6..d91bdc89 100644
--- a/puppet/modules/tor/manifests/daemon/hidden_service.pp
+++ b/puppet/modules/tor/manifests/daemon/hidden_service.pp
@@ -2,6 +2,7 @@
 define tor::daemon::hidden_service(
   $ports         = [],
   $single_hop    = false,
+  $v3            = false,
   $data_dir      = $tor::daemon::data_dir,
   $ensure        = present ) {
 
-- 
cgit v1.2.3