diff options
| author | Micah Anderson <micah@riseup.net> | 2012-03-14 15:29:35 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-03-14 15:29:35 -0400 |
| commit | a19e1cacb1d52287c35e96fdb37ad3a0ab8c0dd1 (patch) | |
| tree | 7067b93696fd9a743e51db59eda213a2d97bc9a7 | |
| parent | 44f4ba052ae9c02bc8923767885466c035fbb6ec (diff) | |
| download | puppet-tor-a19e1cacb1d52287c35e96fdb37ad3a0ab8c0dd1.tar.gz puppet-tor-a19e1cacb1d52287c35e96fdb37ad3a0ab8c0dd1.tar.bz2 | |
outbound_bindaddress should be outbound_bindaddresses and $outbound_bindaddresses = $listen_addresses
| -rw-r--r-- | manifests/daemon.pp | 24 | ||||
| -rw-r--r-- | templates/torrc.relay.erb | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 173e565..6d8c315 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -98,18 +98,18 @@ class tor::daemon inherits tor { } # relay definition - define relay( $port = 0, - $listen_addresses = [], - $outbound_bindaddress = $listen_address, - $bandwidth_rate = 0, # KB/s, 0 for no limit. - $bandwidth_burst = 0, # KB/s, 0 for no limit. - $accounting_max = 0, # GB, 0 for no limit. - $accounting_start = [], - $contact_info = '', - $my_family = '', # TODO: autofill with other relays - $address = "tor.${domain}", - $bridge_relay = 0, - $ensure = present ) { + define relay( $port = 0, + $listen_addresses = [], + $outbound_bindaddresses = $listen_addresses, + $bandwidth_rate = 0, # KB/s, 0 for no limit. + $bandwidth_burst = 0, # KB/s, 0 for no limit. + $accounting_max = 0, # GB, 0 for no limit. + $accounting_start = [], + $contact_info = '', + $my_family = '', # TODO: autofill with other relays + $address = "tor.${domain}", + $bridge_relay = 0, + $ensure = present ) { $nickname = $name concatenated_file_part { '03.relay': diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb index 72625d4..1b2e082 100644 --- a/templates/torrc.relay.erb +++ b/templates/torrc.relay.erb @@ -4,8 +4,8 @@ ORPort <%= port %> <%- for listen_address in listen_addresses -%> ORListenAddress <%= listen_address %> <%- end -%> -<%- for outbound_bindaddress in outbound_bindaddress -%> -OutboundBindAddress <%= outbound_bindaddress %> +<%- for outbound_bindaddresses in outbound_bindaddresses -%> +OutboundBindAddress <%= outbound_bindaddresses %> <%- end -%> <%- if nickname != '' then -%> Nickname <%= nickname %> |