Use data_dir variable instead of hard-coded path.

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 1d73c7d02fa3c5347955ef58d338b9ef811f4c5f..1eaa1f7c502870c6e1de39d047aae3e28b4f0d17 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -131,6 +131,7 @@ class tor::daemon inherits tor {
 
   # hidden services definition
   define hidden_service( $ports = [],
+                         $data_dir = $tor::daemon::data_dir,
                          $ensure = present ) {
     concatenated_file_part { "05.hidden_service.${name}":
       dir     => $tor::daemon::snippet_dir,

diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb
index 1a35faae7bc9197fc67c99e5fe1e22eaa3a5fe31..b9f758ab74fee6f19eee9b21abc077583e45f3e5 100644 (file)
--- a/templates/torrc.hidden_service.erb
+++ b/templates/torrc.hidden_service.erb
@@ -1,5 +1,5 @@
 # hidden service <%= name %>
-HiddenServiceDir /var/lib/tor/<%= name %>
+HiddenServiceDir <%= data_dir %>/<%= name %>
 <%- for port in ports -%>
 HiddenServicePort <%= port %>
 <%- end -%>