diff options
| author | varac <varacanero@zeromail.org> | 2016-05-17 11:50:50 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-05-17 11:50:50 +0200 |
| commit | 9981a70f7ba1f9e4fe33e4eb46654295287c1fc1 (patch) | |
| tree | 1beb63d346b919727a0e7e8df124feb5039930cb /manifests/daemon | |
| parent | 43506968b1760b8a54f012c72baa9a5820cee21a (diff) | |
| parent | fd7aad3cb5fb7f8db73ef5dbe2cbab9ab4868325 (diff) | |
Merge branch 'master' of gitlab.com:shared-puppet-modules-group/tor
Diffstat (limited to 'manifests/daemon')
| -rw-r--r-- | manifests/daemon/directory.pp | 6 | ||||
| -rw-r--r-- | manifests/daemon/relay.pp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/manifests/daemon/directory.pp b/manifests/daemon/directory.pp index b71b6e6..d877a86 100644 --- a/manifests/daemon/directory.pp +++ b/manifests/daemon/directory.pp @@ -2,7 +2,7 @@ define tor::daemon::directory ( $port = 0, $listen_addresses = [], - $port_front_page = '/etc/tor/tor.html', + $port_front_page = '/etc/tor/tor-exit-notice.html', $ensure = present ) { concat::fragment { '06.directory': @@ -15,9 +15,9 @@ define tor::daemon::directory ( target => $tor::daemon::config_file, } - file { '/etc/tor/tor.html': + file { '/etc/tor/tor-exit-notice.html': ensure => $ensure, - source => 'puppet:///modules/tor/tor.html', + source => 'puppet:///modules/tor/tor-exit-notice.html', require => File['/etc/tor'], owner => 'debian-tor', group => 'debian-tor', diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp index d5296de..ff52893 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 } |