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 /templates/torrc.relay.erb | |
parent | 43506968b1760b8a54f012c72baa9a5820cee21a (diff) | |
parent | fd7aad3cb5fb7f8db73ef5dbe2cbab9ab4868325 (diff) |
Merge branch 'master' of gitlab.com:shared-puppet-modules-group/tor
Diffstat (limited to 'templates/torrc.relay.erb')
-rw-r--r-- | templates/torrc.relay.erb | 88 |
1 files changed, 45 insertions, 43 deletions
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb index 85320d3..a286459 100644 --- a/templates/torrc.relay.erb +++ b/templates/torrc.relay.erb @@ -1,44 +1,46 @@ # relay -<%- if port != 0 then -%> -ORPort <%= port %> -<%- for listen_address in listen_addresses -%> -ORListenAddress <%= listen_address %> -<%- end -%> -<%- for outbound_bindaddress in real_outbound_bindaddresses -%> -OutboundBindAddress <%= outbound_bindaddress %> -<%- end -%> -<%- if nickname != '' then -%> -Nickname <%= nickname %> -<%- end -%> -<%- if address != '' then -%> -Address <%= address %> -<%- 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 -%> - +<% if @port != 0 -%> +ORPort <%= @port %> +<% @listen_addresses.each do |listen_address| -%> +ORListenAddress <%= @listen_address %> +<% end -%> +<% @real_outbound_bindaddresses.each do |outbound_bindaddress| -%> +OutboundBindAddress <%= @outbound_bindaddress %> +<% 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 -%> |