aboutsummaryrefslogtreecommitdiff
path: root/manifests/daemon
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-03-27 18:50:01 +0000
committerMicah <micah@riseup.net>2015-03-27 18:50:01 +0000
commit3925f36f7cd0f15029304363b0f5749750627c96 (patch)
tree5613a76af8c008a5820e41c097ed94f231412956 /manifests/daemon
parenta31579095231c68a2786955b9149d3bcd13400af (diff)
parent19a44ce97f59633002d844e2b37f2b26b2f1cfbc (diff)
downloadpuppet-tor-3925f36f7cd0f15029304363b0f5749750627c96.tar.gz
puppet-tor-3925f36f7cd0f15029304363b0f5749750627c96.tar.bz2
Merge branch 'improvements' into 'master'
Improvements These are a bunch of improvements I got on my github profile in the past. Interested in merging them? Summary: * adds tor repo management * removes a workaround for a fixed bug * adds tor-arm support * support for safe logging * puppet 3 ready templates. It's merged on top of the current master. See merge request !1
Diffstat (limited to 'manifests/daemon')
-rw-r--r--manifests/daemon/relay.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp
index d5296de..3ef8602 100644
--- a/manifests/daemon/relay.pp
+++ b/manifests/daemon/relay.pp
@@ -3,6 +3,7 @@ define tor::daemon::relay(
$port = 0,
$listen_addresses = [],
$outbound_bindaddresses = [],
+ $portforwarding = 0,
# KB/s, defaulting to using tor's default: 5120KB/s
$bandwidth_rate = '',
# KB/s, defaulting to using tor's default: 10240KB/s
@@ -24,7 +25,7 @@ define tor::daemon::relay(
$nickname = $name
if $outbound_bindaddresses == [] {
- $real_outbound_bindaddresses = $listen_addresses
+ $real_outbound_bindaddresses = ''
} else {
$real_outbound_bindaddresses = $outbound_bindaddresses
}