From 4676a02bf6e18ab2ea2f430b461b5475034ae699 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 15 Mar 2015 13:06:40 +0100 Subject: make sure it's an array --- templates/torrc.hidden_service.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb index 4dec0b2..7cd849f 100644 --- a/templates/torrc.hidden_service.erb +++ b/templates/torrc.hidden_service.erb @@ -1,6 +1,6 @@ # hidden service <%= @name %> HiddenServiceDir <%= @data_dir %>/<%= @name %> -<% @ports.each do |port| -%> +<% Array(@ports).each do |port| -%> HiddenServicePort <%= port %> <% end -%> -- cgit v1.2.3 From 55084912ec9a5b8bcc8766d5db95beb16b618892 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 15 Mar 2015 13:07:32 +0100 Subject: make it simpler to define ports if we have only one port directly map it to the same port on the localhost. --- templates/torrc.hidden_service.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb index 7cd849f..6a97351 100644 --- a/templates/torrc.hidden_service.erb +++ b/templates/torrc.hidden_service.erb @@ -1,6 +1,6 @@ # hidden service <%= @name %> HiddenServiceDir <%= @data_dir %>/<%= @name %> <% Array(@ports).each do |port| -%> -HiddenServicePort <%= port %> +HiddenServicePort <%= port =~ /^\d+$/ ? "#{port} 127.0.0.1:#{port}" : port %> <% end -%> -- cgit v1.2.3 From 720c1670750345e8c361219a58c2722a603e26bb Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 1 Nov 2016 20:26:20 +0100 Subject: add support for onionbalance --- templates/onionbalance/Debian.torrc.erb | 5 +++++ templates/onionbalance/RedHat.torrc.erb | 13 +++++++++++++ templates/onionbalance/config.yaml.erb | 10 ++++++++++ 3 files changed, 28 insertions(+) create mode 100644 templates/onionbalance/Debian.torrc.erb create mode 100644 templates/onionbalance/RedHat.torrc.erb create mode 100644 templates/onionbalance/config.yaml.erb (limited to 'templates') 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..3f45bd1 --- /dev/null +++ b/templates/onionbalance/config.yaml.erb @@ -0,0 +1,10 @@ +# OnionBalance Config File +services: +<% @services.keys.sort.each do |key| -%> +- instances: +<% (@services[key].keys - ['_key_content']).sort.each do |inst| -%> + - address: <%= @services[key][inst] %> + name: <%= inst %> +<% end -%> + key: <%= key %>.key +<% end -%> -- cgit v1.2.3 From 914df896d915cea5acade2732526d3bbc75b176d Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 1 Nov 2016 21:29:31 +0100 Subject: make it possible to also add pregenerated private keys for onion services or even let them pregenerate on the fly --- templates/torrc.hidden_service.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb index 6a97351..77168d8 100644 --- a/templates/torrc.hidden_service.erb +++ b/templates/torrc.hidden_service.erb @@ -1,5 +1,5 @@ # hidden service <%= @name %> -HiddenServiceDir <%= @data_dir %>/<%= @name %> +HiddenServiceDir <%= @data_dir_path %> <% Array(@ports).each do |port| -%> HiddenServicePort <%= port =~ /^\d+$/ ? "#{port} 127.0.0.1:#{port}" : port %> <% end -%> -- cgit v1.2.3 From d91d70dd378a4a91c740b03b0852432ef128b24a Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 4 Nov 2016 18:52:39 +0100 Subject: store key & hostname --- templates/torrc.hidden_service.erb | 6 ------ templates/torrc.onion_service.erb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 templates/torrc.hidden_service.erb create mode 100644 templates/torrc.onion_service.erb (limited to 'templates') diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb deleted file mode 100644 index 77168d8..0000000 --- a/templates/torrc.hidden_service.erb +++ /dev/null @@ -1,6 +0,0 @@ -# hidden service <%= @name %> -HiddenServiceDir <%= @data_dir_path %> -<% Array(@ports).each do |port| -%> -HiddenServicePort <%= port =~ /^\d+$/ ? "#{port} 127.0.0.1:#{port}" : port %> -<% end -%> - diff --git a/templates/torrc.onion_service.erb b/templates/torrc.onion_service.erb new file mode 100644 index 0000000..77168d8 --- /dev/null +++ b/templates/torrc.onion_service.erb @@ -0,0 +1,6 @@ +# hidden service <%= @name %> +HiddenServiceDir <%= @data_dir_path %> +<% Array(@ports).each do |port| -%> +HiddenServicePort <%= port =~ /^\d+$/ ? "#{port} 127.0.0.1:#{port}" : port %> +<% end -%> + -- cgit v1.2.3 From d17494c600a59206601e4dfd0731b6af36b59631 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 5 Nov 2016 13:38:45 +0100 Subject: correct identation --- templates/onionbalance/config.yaml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/onionbalance/config.yaml.erb b/templates/onionbalance/config.yaml.erb index 3f45bd1..b1d4d80 100644 --- a/templates/onionbalance/config.yaml.erb +++ b/templates/onionbalance/config.yaml.erb @@ -1,10 +1,10 @@ # OnionBalance Config File services: <% @services.keys.sort.each do |key| -%> -- instances: + - key: /etc/onionbalance/<%= key %>.key + instances: <% (@services[key].keys - ['_key_content']).sort.each do |inst| -%> - - address: <%= @services[key][inst] %> - name: <%= inst %> + - address: <%= @services[key][inst] %> + name: <%= inst %> <% end -%> - key: <%= key %>.key <% end -%> -- cgit v1.2.3 From 1fef62f18dcbcf0f1995603b8f595f67ebf483d5 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 30 Aug 2017 00:18:32 +0200 Subject: cleanup template mess that produces invalid template --- templates/torrc.global.erb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'templates') diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index f577673..9cf7816 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 -%> <% rules.each do |log_rule| -%> Log <%= log_rule %> -<% end -%> -<% end -%> -<%- if @safe_logging != 1 then -%> -SafeLogging <%= @safe_logging %> -<%- end -%> +<% end +end -%> +<% if (v=scope['tor::daemon::safe_logging']) != 1 -%> +SafeLogging <%= v %> +<% 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 -%> -- cgit v1.2.3 From 7e11328e61132438dac8a19a5caec24dc1f58257 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 13 Feb 2018 01:23:22 +0100 Subject: reduce output of empty lines --- templates/torrc.onion_service.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'templates') diff --git a/templates/torrc.onion_service.erb b/templates/torrc.onion_service.erb index db629fc..9b05c43 100644 --- a/templates/torrc.onion_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_path %> <% Array(@ports).each do |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_path %>3 HiddenServiceVersion 3 <% Array(@ports).each do |port| -%> HiddenServicePort <%= port %> -<% end -%> -<% end -%> +<% end +end -%> -- cgit v1.2.3