From 908310cc3edb290ecd94332f57e09f90317bc0fc Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Wed, 11 Jan 2012 03:04:45 -0200
Subject: fixing parameter path

---
 manifests/daemon.pp             | 7 +++----
 templates/torrc.exit_policy.erb | 1 -
 templates/torrc.global.erb      | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index da70457..05ddf5b 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -73,8 +73,7 @@ class tor::daemon inherits tor {
   }
 
   # global configurations
-  define global_opts( $data_dir = $data_dir,
-                      $log_rules = [ 'notice file /var/log/tor/notices.log' ],
+  define global_opts( $log_rules = [ 'notice file /var/log/tor/notices.log' ],
                       $ensure = present ) {
     file { "${tor::daemon::snippet_dir}/01.global":
       content => template('tor/torrc.global.erb'),
@@ -110,7 +109,7 @@ class tor::daemon inherits tor {
                 $bridge_relay          = 0,
                 $ensure                = present ) {
     $nickname = $name
-    $address = $hostname
+    $address = "tor.${domain}"
 
     file { "${tor::daemon::snippet_dir}/03.relay":
       content => template('tor/torrc.relay.erb'),
@@ -149,7 +148,7 @@ class tor::daemon inherits tor {
   # directory advertising
   define directory ( $port = 0,
                      $listen_addresses = [],
-                     $port_front_page = '',
+                     $port_front_page = '/etc/tor/tor-exit-notice.html',
                      $ensure = present ) {
     file { "${tor::daemon::snippet_dir}/06.directory":
       content => template('tor/torrc.directory.erb'),
diff --git a/templates/torrc.exit_policy.erb b/templates/torrc.exit_policy.erb
index 68ceba2..e240013 100644
--- a/templates/torrc.exit_policy.erb
+++ b/templates/torrc.exit_policy.erb
@@ -3,7 +3,6 @@
 <%- for policy in accept -%>
 ExitPolicy accept <%= policy %>
 <%- end -%>
-
 <%- for policy in reject -%>
 ExitPolicy reject <%= policy %>
 <%- end -%>
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb
index 96ea930..019d0a1 100644
--- a/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@ -1,7 +1,7 @@
 # runtime
 
 RunAsDaemon 1
-DataDirectory <%= data_dir %>
+DataDirectory <%= tor::daemon::data_dir %>
 
 # log
 
-- 
cgit v1.2.3