diff options
| author | drebs <drebs@riseup.net> | 2012-01-08 03:10:56 -0200 |
|---|---|---|
| committer | drebs <drebs@riseup.net> | 2012-01-08 03:10:56 -0200 |
| commit | 2509c29d11b37681e7d0f1b4f68a31c986e53eef (patch) | |
| tree | 46a5cf34d7e9111b4f13032b48e470ecf3365e6c /manifests | |
| parent | 83644ab44879e799edde8d0c7ea04fcb39d94f5b (diff) | |
| download | puppet-tor-2509c29d11b37681e7d0f1b4f68a31c986e53eef.tar.gz puppet-tor-2509c29d11b37681e7d0f1b4f68a31c986e53eef.tar.bz2 | |
fixing relay options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/daemon.pp | 2 | ||||
| -rw-r--r-- | manifests/relay.pp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index c669d71..c9819c3 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -12,7 +12,7 @@ class tor::daemon inherits tor { $socks_policies = [ 'accept 127.0.0.1/16', 'reject *' ], $log_rules = [ 'notice file /var/log/tor/notices.log' ], $data_directory = '/var/tor', - $control_port = false, + $control_port = 0, $hashed_control_password = '', $hidden_services = [], $or_port = 0, diff --git a/manifests/relay.pp b/manifests/relay.pp index 6f74895..a6d813c 100644 --- a/manifests/relay.pp +++ b/manifests/relay.pp @@ -3,18 +3,19 @@ class tor::relay inherits tor::daemon { tor::daemon::config { "tor-relay": socks_port => 0, socks_listen_addresses => [], + socks_policies => [], or_port => 9001, or_listen_address => '', nickname => '', - address => $hostname, - relay_bandwidth_rate => 0, - relay_bandwidth_burst => 0, + address => '', + relay_bandwidth_rate => 0, + relay_bandwidth_burst => 0, accounting_max => 0, accounting_start => [], contact_info => '', dir_port => 0, dir_listen_address => '', - dir_port_front_page => '', + dir_port_front_page => '', my_family => '', exit_policies => [], } |