aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-01-26 19:05:14 +0100
committerintrigeri <intrigeri@boum.org>2012-01-26 19:05:14 +0100
commit323c63a4303355f78272416843119606abecece1 (patch)
treeb38368349336322e0d108ed21c710da6c74bcf02
parent1e09f8fa25cba269b28f55afb336bbc287acf194 (diff)
downloadpuppet-tor-323c63a4303355f78272416843119606abecece1.tar.gz
puppet-tor-323c63a4303355f78272416843119606abecece1.tar.bz2
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.
-rw-r--r--manifests/daemon.pp2
-rw-r--r--templates/torrc.hidden_service.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 4637690..1d73c7d 100644
--- 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 aed685f..1a35faa 100644
--- 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 -%>