fixing parameter path

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index da70457010626866265d9b0b156a6fa219fcddf0..05ddf5b39085b89405d50228870f0c48c4195a3c 100644 (file)
--- 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 68ceba2f239e200a84fee7b914a4f371bd74f9ce..e240013a858be9b1e25cd535b3d3257c9e1254f0 100644 (file)
--- 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 96ea930793cb5fb66d64def720167d1a2e33b27f..019d0a109a3921822d11635b0dafde859c02f6ef 100644 (file)
--- 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