diff options
| author | intrigeri <intrigeri@boum.org> | 2012-06-19 04:48:26 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-06-19 05:22:47 +0200 |
| commit | d017a7eee415a1398a0f7e533a5bfba3986e7505 (patch) | |
| tree | f1e8bb4da11e6c902a841cf6cd50881561f8924b | |
| parent | f401daa245495233c3d86d5f955105be564e02b1 (diff) | |
| download | puppet-tor-d017a7eee415a1398a0f7e533a5bfba3986e7505.tar.gz puppet-tor-d017a7eee415a1398a0f7e533a5bfba3986e7505.tar.bz2 | |
Add support for AutomapHostsOnResolve.
| -rw-r--r-- | manifests/daemon.pp | 5 | ||||
| -rw-r--r-- | templates/torrc.global.erb | 1 |
2 files changed, 4 insertions, 2 deletions
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%> |