From: intrigeri <intrigeri@boum.org>
Date: Thu, 26 Jan 2012 18:06:14 +0000 (+0100)
Subject: Use data_dir variable instead of hard-coded path.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=da59385e711976614d47a88cf607edda98900e75;p=puppet-tor.git

Use data_dir variable instead of hard-coded path.
---

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 1d73c7d..1eaa1f7 100644
--- 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 1a35faa..b9f758a 100644
--- 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 -%>