diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/torrc.directory.erb | 7 | ||||
| -rw-r--r-- | templates/torrc.dns.erb | 3 | ||||
| -rw-r--r-- | templates/torrc.exit_policy.erb | 4 | ||||
| -rw-r--r-- | templates/torrc.global.erb | 2 | ||||
| -rw-r--r-- | templates/torrc.onion_service.erb | 14 | ||||
| -rw-r--r-- | templates/torrc.relay.erb | 7 | ||||
| -rw-r--r-- | templates/torrc.socks.erb | 5 | ||||
| -rw-r--r-- | templates/torrc.transparent.erb | 3 | ||||
| -rw-r--r-- | templates/torrc.transport_plugin.erb | 13 |
9 files changed, 35 insertions, 23 deletions
diff --git a/templates/torrc.directory.erb b/templates/torrc.directory.erb index 1af9f40..d70ab39 100644 --- a/templates/torrc.directory.erb +++ b/templates/torrc.directory.erb @@ -1,11 +1,8 @@ # directory listing -<% if port != '0' -%> +<% if @port != '0' -%> DirPort <%= @port %> <% end -%> -<% listen_addresses.each do |listen_address| -%> -DirListenAddress <%= listen_address %> -<% end -%> <% if @port_front_page != '' -%> -DirPortFrontPage <%= port_front_page %> +DirPortFrontPage <%= @port_front_page %> <%- end -%> diff --git a/templates/torrc.dns.erb b/templates/torrc.dns.erb index 57cf46d..a89ba31 100644 --- a/templates/torrc.dns.erb +++ b/templates/torrc.dns.erb @@ -1,5 +1,2 @@ # DNS DNSPort <%= @port %> -<% @listen_addresses.each do |listen_address| -%> -DNSListenAddress <%= listen_address %> -<% end -%> diff --git a/templates/torrc.exit_policy.erb b/templates/torrc.exit_policy.erb index a30d43b..5481914 100644 --- a/templates/torrc.exit_policy.erb +++ b/templates/torrc.exit_policy.erb @@ -2,10 +2,10 @@ <% if @reject_private != '1' -%> ExitPolicyRejectPrivate <%= @reject_private %> <% end -%> -<% @accept.each do |policy| -%> +<% Array(@accept).each do |policy| -%> ExitPolicy accept <%= policy %> <% end -%> -<% @reject.each do |policy| -%> +<% Array(@reject).each do |policy| -%> ExitPolicy reject <%= policy %> <% end -%> diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index 9cf7816..763e63f 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -8,7 +8,7 @@ DataDirectory <%= v %> <% if (rules=scope['tor::daemon::log_rules']).empty? -%> Log notice syslog <% else -%> -<% rules.each do |log_rule| -%> +<% Array(rules).each do |log_rule| -%> Log <%= log_rule %> <% end end -%> diff --git a/templates/torrc.onion_service.erb b/templates/torrc.onion_service.erb index 77168d8..db629fc 100644 --- a/templates/torrc.onion_service.erb +++ b/templates/torrc.onion_service.erb @@ -1,6 +1,20 @@ +<% if @single_hop != false %> +HiddenServiceSingleHopMode 1 +HiddenServiceNonAnonymousMode 1 +SOCKSPort 0 +<% end %> + # hidden service <%= @name %> HiddenServiceDir <%= @data_dir_path %> <% Array(@ports).each do |port| -%> HiddenServicePort <%= port =~ /^\d+$/ ? "#{port} 127.0.0.1:#{port}" : port %> <% end -%> +<% if @v3 != false %> +# hidden service v3 static +HiddenServiceDir <%= @data_dir_path %>3 +HiddenServiceVersion 3 +<% Array(@ports).each do |port| -%> +HiddenServicePort <%= port %> +<% end -%> +<% end -%> diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb index 511bda1..7735b47 100644 --- a/templates/torrc.relay.erb +++ b/templates/torrc.relay.erb @@ -1,11 +1,8 @@ # relay <% 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 %> +<% Array(@real_outbound_bindaddresses).each do |outbound_bindaddress| -%> +OutboundBindAddress <%= @outbound_bindaddress %> <% end -%> <% if @nickname != '' -%> Nickname <%= @nickname %> diff --git a/templates/torrc.socks.erb b/templates/torrc.socks.erb index 4bc3ddc..c6aba60 100644 --- a/templates/torrc.socks.erb +++ b/templates/torrc.socks.erb @@ -1,9 +1,6 @@ # socks SocksPort <%= @port %> -<% @listen_addresses.each do |listen_address| -%> -SocksListenAddress <%= listen_address %> -<% end -%> -<% @policies.each do |policy| -%> +<% Array(@policies).each do |policy| -%> SocksPolicy <%= policy %> <% end -%> diff --git a/templates/torrc.transparent.erb b/templates/torrc.transparent.erb index c683150..c57d138 100644 --- a/templates/torrc.transparent.erb +++ b/templates/torrc.transparent.erb @@ -1,5 +1,2 @@ # Transparent proxy TransPort <%= @port %> -<% @listen_addresses.each do |listen_address| -%> -TransListenAddress <%= listen_address %> -<% end -%> diff --git a/templates/torrc.transport_plugin.erb b/templates/torrc.transport_plugin.erb new file mode 100644 index 0000000..d57f0e8 --- /dev/null +++ b/templates/torrc.transport_plugin.erb @@ -0,0 +1,13 @@ +# transport plugin +<% if @servertransport_plugin != '' -%> +ServerTransportPlugin <%= @servertransport_plugin %> +<% end -%> +<% if @servertransport_listenaddr != '' -%> +ServerTransportListenAddr <%= @servertransport_listenaddr %> +<% end -%> +<% if @servertransport_options != '' -%> +ServerTransportOptions <%= @servertransport_options %> +<% end -%> +<% if @ext_port != '' -%> +ExtORPort <%= @ext_port %> +<% end -%> |