Use /var/lib/tor as the default Tor data directory.

This is the default upstream and Debian one,
and I don't see why we would want to diverge.

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 463769078764ec2ad30421d57975259c26eba1a2..1d73c7d02fa3c5347955ef58d338b9ef811f4c5f 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -2,7 +2,7 @@
 class tor::daemon inherits tor {
 
   # config variables
-  $data_dir    = '/var/tor'
+  $data_dir    = '/var/lib/tor'
   $config_file = '/etc/tor/torrc'
   $spool_dir   = '/var/lib/puppet/modules/tor'
   $snippet_dir = "${spool_dir}/torrc.d"

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