From: intrigeri <intrigeri@boum.org>
Date: Tue, 19 Jun 2012 02:48:26 +0000 (+0200)
Subject: Add support for AutomapHostsOnResolve.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d017a7eee415a1398a0f7e533a5bfba3986e7505;p=puppet-tor.git

Add support for AutomapHostsOnResolve.
---

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 2484edf..d04734d 100644
--- 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 84e244d..3a3b623 100644
--- 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%>