Merge remote-tracking branch 'shared/master'HEADmaster

1 files changed, 9 insertions, 14 deletions

diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp
index 9e053cc..8a062c5 100644
--- a/manifests/daemon/hidden_service.pp
+++ b/manifests/daemon/hidden_service.pp
@@ -3,19 +3,14 @@ define tor::daemon::hidden_service(
   $ports         = [],
   $single_hop    = false,
   $v3            = false,
-  $data_dir      = $tor::daemon::data_dir ) {
-
-
-
-  if $single_hop {
-    file { "${$data_dir}/${$name}/onion_service_non_anonymous":
-      ensure => 'present',
-    }
-  }
-
-  concat::fragment { "05.hidden_service.${name}":
-    content => template('tor/torrc.hidden_service.erb'),
-    order   => 05,
-    target  => $tor::daemon::config_file,
+  $data_dir      = $tor::daemon::data_dir,
+) {
+  info("Using tor::daemon::hidden_service is deprecated, please use tor::daemon::onion_service for ${name}")
+  tor::daemon::onion_service{
+    $name:
+      ports      => $ports,
+      single_hop => $single_hop,
+      v3         => $v3,
+      data_dir   => $data_dir,
   }
 }