diff options
| author | mh <mh@immerda.ch> | 2014-04-18 11:10:16 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-18 11:10:16 +0200 |
| commit | 5228a3d6bd2fce2e56bea538bd9c29641cf22474 (patch) | |
| tree | 892e962bbd36915248545bf122810b4c2aa936fe /templates/torrc.relay.erb | |
| parent | 0a7fa2d5ec783a0c72dc2484c0e5958ec281db1f (diff) | |
| download | puppet-tor-5228a3d6bd2fce2e56bea538bd9c29641cf22474.tar.gz puppet-tor-5228a3d6bd2fce2e56bea538bd9c29641cf22474.tar.bz2 | |
address puppet 3.x deprecation warnings
Diffstat (limited to 'templates/torrc.relay.erb')
| -rw-r--r-- | templates/torrc.relay.erb | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb index 74a7c61..511bda1 100644 --- a/templates/torrc.relay.erb +++ b/templates/torrc.relay.erb @@ -1,46 +1,46 @@ # relay -<%- if port != 0 then -%> -ORPort <%= port %> -<%- for listen_address in listen_addresses -%> +<% if @port != 0 -%> +ORPort <%= @port %> +<% listen_addresses.each do |listen_address| -%> ORListenAddress <%= listen_address %> -<%- end -%> -<%- for outbound_bindaddress in real_outbound_bindaddresses -%> +<% end -%> +<% real_outbound_bindaddresses.each do |outbound_bindaddress| -%> OutboundBindAddress <%= outbound_bindaddress %> -<%- end -%> -<%- if nickname != '' then -%> -Nickname <%= nickname %> -<%- end -%> -<%- if address != '' then -%> -Address <%= address %> -<%- end -%> -<%- if portforwarding != '0' then -%> -PortForwarding <%= portforwarding %> -<%- end -%> -<%- if bandwidth_rate != '' then -%> -BandwidthRate <%= bandwidth_rate %> KB -<%- end -%> -<%- if bandwidth_burst != '' then -%> -BandwidthBurst <%= bandwidth_burst %> KB -<%- end -%> -<%- if relay_bandwidth_rate != '0' then -%> -RelayBandwidthRate <%= relay_bandwidth_rate %> KB -<%- end -%> -<%- if relay_bandwidth_burst != '0' then -%> -RelayBandwidthBurst <%= relay_bandwidth_burst %> KB -<%- end -%> -<%- if accounting_max != '0' then -%> -AccountingMax <%= accounting_max %> GB -<%- if accounting_start then -%> -AccountingStart <%= accounting_start %> -<%- end -%> -<%- end -%> -<%- if contact_info != '' then -%> -ContactInfo <%= contact_info %> -<%- end -%> -<%- end -%> -<%- if my_family != '' then -%> -MyFamily <%= my_family %> -<%- end -%> -<%- if bridge_relay != '0' then -%> -BridgeRelay <%= bridge_relay %> -<%- end -%> +<% end -%> +<% if @nickname != '' -%> +Nickname <%= @nickname %> +<% end -%> +<% if @address != '' -%> +Address <%= @address %> +<% end -%> +<% if @portforwarding != '0' -%> +PortForwarding <%= @portforwarding %> +<% end -%> +<% if @bandwidth_rate != '' -%> +BandwidthRate <%= @bandwidth_rate %> KB +<% end -%> +<% if @bandwidth_burst != '' -%> +BandwidthBurst <%= @bandwidth_burst %> KB +<% end -%> +<% if @relay_bandwidth_rate != '0' -%> +RelayBandwidthRate <%= @relay_bandwidth_rate %> KB +<% end -%> +<% if @relay_bandwidth_burst != '0' -%> +RelayBandwidthBurst <%= @relay_bandwidth_burst %> KB +<% end -%> +<% if @accounting_max != '0' -%> +AccountingMax <%= @accounting_max %> GB +<% if @accounting_start -%> +AccountingStart <%= @accounting_start %> +<% end -%> +<% end -%> +<% if @contact_info != '' -%> +ContactInfo <%= @contact_info %> +<% end -%> +<% end -%> +<% if @my_family != '' -%> +MyFamily <%= @my_family %> +<% end -%> +<% if @bridge_relay != '0' -%> +BridgeRelay <%= @bridge_relay %> +<% end -%> |