diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/onionbalance/Debian.torrc.erb | 5 | ||||
| -rw-r--r-- | templates/onionbalance/RedHat.torrc.erb | 13 | ||||
| -rw-r--r-- | templates/onionbalance/config.yaml.erb | 10 | ||||
| -rw-r--r-- | templates/torrc.global.erb | 20 | ||||
| -rw-r--r-- | templates/torrc.onion_service.erb (renamed from templates/torrc.hidden_service.erb) | 16 |
5 files changed, 46 insertions, 18 deletions
diff --git a/templates/onionbalance/Debian.torrc.erb b/templates/onionbalance/Debian.torrc.erb new file mode 100644 index 0000000..4b1afc4 --- /dev/null +++ b/templates/onionbalance/Debian.torrc.erb @@ -0,0 +1,5 @@ +# Tor config for the onionbalance management server +# --- +# The onionbalance service must be able to access the Tor control port. +ControlPort 9051 +SocksPort 0 diff --git a/templates/onionbalance/RedHat.torrc.erb b/templates/onionbalance/RedHat.torrc.erb new file mode 100644 index 0000000..023748b --- /dev/null +++ b/templates/onionbalance/RedHat.torrc.erb @@ -0,0 +1,13 @@ +# Tor config for the onionbalance management server +# --- +# The onionbalance service must be able to access the Tor control port. + +DataDirectory /var/lib/tor/onionbalance-data + +ControlPort 9051 +CookieAuthentication 1 +SocksPort 0 + +CookieAuthFileGroupReadable 1 +CookieAuthFile /run/tor/onionbalance.control.authcookie + diff --git a/templates/onionbalance/config.yaml.erb b/templates/onionbalance/config.yaml.erb new file mode 100644 index 0000000..b1d4d80 --- /dev/null +++ b/templates/onionbalance/config.yaml.erb @@ -0,0 +1,10 @@ +# OnionBalance Config File +services: +<% @services.keys.sort.each do |key| -%> + - key: /etc/onionbalance/<%= key %>.key + instances: +<% (@services[key].keys - ['_key_content']).sort.each do |inst| -%> + - address: <%= @services[key][inst] %> + name: <%= inst %> +<% end -%> +<% end -%> diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index c29b76b..763e63f 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -1,24 +1,24 @@ # runtime RunAsDaemon 1 -<% if (v=scope.lookupvar('tor::daemon::data_dir')) != '/var/lib/tor' -%> +<% if (v=scope['tor::daemon::data_dir']) != '/var/lib/tor' -%> DataDirectory <%= v %> <% end -%> # log -<% if (rules=scope.lookupvar('tor::daemon::log_rules')).empty? -%> +<% if (rules=scope['tor::daemon::log_rules']).empty? -%> Log notice syslog <% else -%> <% Array(rules).each do |log_rule| -%> Log <%= log_rule %> -<% end -%> -<% end -%> -<%- if (v=scope.lookupvar('tor::daemon::safe_logging')) != '1' then -%> +<% end +end -%> +<% if (v=scope['tor::daemon::safe_logging']) != 1 -%> SafeLogging <%= v %> -<%- end -%> +<% end -%> -<% if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%> +<% if (v=scope['tor::daemon::automap_hosts_on_resolve']) != 0 -%> AutomapHostsOnResolve <%= v %> -<% end -%> -<% if (v=scope.lookupvar('tor::daemon::use_bridges')) != '0' -%> +<% end -%> +<% if (v=scope['tor::daemon::use_bridges']) != 0 -%> UseBridges <%= v %> -<%- end -%> +<% end -%> diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.onion_service.erb index c7dbe9e..9b05c43 100644 --- a/templates/torrc.hidden_service.erb +++ b/templates/torrc.onion_service.erb @@ -1,20 +1,20 @@ -<% if @single_hop != false %> +<% if @single_hop != false -%> HiddenServiceSingleHopMode 1 HiddenServiceNonAnonymousMode 1 SOCKSPort 0 -<% end %> +<% end -%> # hidden service <%= @name %> -HiddenServiceDir <%= @data_dir %>/<%= @name %> +HiddenServiceDir <%= @data_dir_path %> <% Array(@ports).each do |port| -%> -HiddenServicePort <%= port %> +HiddenServicePort <%= port =~ /^\d+$/ ? "#{port} 127.0.0.1:#{port}" : port %> <% end -%> -<% if @v3 != false %> +<% if @v3 != false -%> # hidden service v3 static -HiddenServiceDir <%= @data_dir %>/<%= @name -%>3 +HiddenServiceDir <%= @data_dir_path %>3 HiddenServiceVersion 3 <% Array(@ports).each do |port| -%> HiddenServicePort <%= port %> -<% end -%> -<% end -%> +<% end +end -%> |