Add support for AutomapHostsOnResolve.

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 2484edf350e737f79812f2597f207c2cba242ea9..d04734d4f261f0828a74af2601a70d788e5d4e45 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -77,9 +77,10 @@ class tor::daemon inherits tor {
   # global configurations
   define global_opts( $data_dir = $tor::daemon::data_dir,
                       $log_rules = [ 'notice file /var/log/tor/notices.log' ],
-                      $use_bridges = 0 ) {
+                      $use_bridges = 0,
+                      $automap_hosts_on_resolve = 0) {
 
-    concatenated_file_part { '01.global':
+      concatenated_file_part { '01.global':
       dir     => $tor::daemon::snippet_dir,
       content => template('tor/torrc.global.erb'),
       owner => 'debian-tor', group => 'debian-tor', mode => 0644, 

diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb
index 84e244dd99b6b245da4daf37f996ebcbaa1e2508..3a3b623426d01cabe60d2ae47aa489e543ef42ef 100644 (file)
--- a/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@ -11,4 +11,5 @@ Log <%= log_rule %>
 Log notice syslog
 <%- end -%>
 
+AutomapHostsOnResolve <%= automap_hosts_on_resolve%>
 UseBridges <%= use_bridges%>