From 54fcafe131c411a49e4277cd0d14c6ea20044203 Mon Sep 17 00:00:00 2001 From: irregulator Date: Tue, 20 May 2014 23:20:58 +0300 Subject: Initial commit for obfsproxy server feature in platform --- puppet/modules/obfsproxy/templates/etc_conf.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 puppet/modules/obfsproxy/templates/etc_conf.erb (limited to 'puppet/modules/obfsproxy/templates/etc_conf.erb') diff --git a/puppet/modules/obfsproxy/templates/etc_conf.erb b/puppet/modules/obfsproxy/templates/etc_conf.erb new file mode 100644 index 00000000..3313b326 --- /dev/null +++ b/puppet/modules/obfsproxy/templates/etc_conf.erb @@ -0,0 +1,11 @@ +TRANSPORT=<%= @transport %> +PORT=<%= @port %> +DEST_IP=<%= @dest_ip %> +DEST_PORT=<%= @dest_port %> +<% if @transport == "scramblesuit" %> +PARAM=--password=<%= @param %> +<% else %> +PARAM=<%= @param %> +<% end %> +LOG=info + -- cgit v1.2.3 From fedbb6dccf7bd78b0b2a507a817dacaef0b67ac3 Mon Sep 17 00:00:00 2001 From: irregulator Date: Fri, 23 May 2014 17:45:13 +0300 Subject: Be able to specify log_level parameter for obfsproxy log_level sets minimum logging severity of obfsproxy daemon, can be error, warning, info, debug. Defaults to info. --- puppet/modules/obfsproxy/templates/etc_conf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/obfsproxy/templates/etc_conf.erb') diff --git a/puppet/modules/obfsproxy/templates/etc_conf.erb b/puppet/modules/obfsproxy/templates/etc_conf.erb index 3313b326..d9938e1a 100644 --- a/puppet/modules/obfsproxy/templates/etc_conf.erb +++ b/puppet/modules/obfsproxy/templates/etc_conf.erb @@ -7,5 +7,5 @@ PARAM=--password=<%= @param %> <% else %> PARAM=<%= @param %> <% end %> -LOG=info +LOG=<%= @log_level %> -- cgit v1.2.3 From 791e22b136910ecfa204eb78be747baed2b02590 Mon Sep 17 00:00:00 2001 From: irregulator Date: Wed, 28 May 2014 17:35:12 +0300 Subject: Make obfsproxy daemon bind to specific address rather than 0.0.0.0 If obfsproxy is spawned alongside eip service, make it listen to the gateway_adress IP. If obfsproxy is running standalone listen to ip_address. --- puppet/modules/obfsproxy/templates/etc_conf.erb | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/modules/obfsproxy/templates/etc_conf.erb') diff --git a/puppet/modules/obfsproxy/templates/etc_conf.erb b/puppet/modules/obfsproxy/templates/etc_conf.erb index d9938e1a..10f6a7f7 100644 --- a/puppet/modules/obfsproxy/templates/etc_conf.erb +++ b/puppet/modules/obfsproxy/templates/etc_conf.erb @@ -8,4 +8,5 @@ PARAM=--password=<%= @param %> PARAM=<%= @param %> <% end %> LOG=<%= @log_level %> +BINDADDR=<%= @bind_address %> -- cgit v1.2.3 From ee8064a8281c3f933aeea219baec822ec8f52b84 Mon Sep 17 00:00:00 2001 From: irregulator Date: Tue, 3 Jun 2014 17:37:52 +0300 Subject: Remove unneeded newlines from obfsproxy.conf --- puppet/modules/obfsproxy/templates/etc_conf.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'puppet/modules/obfsproxy/templates/etc_conf.erb') diff --git a/puppet/modules/obfsproxy/templates/etc_conf.erb b/puppet/modules/obfsproxy/templates/etc_conf.erb index 10f6a7f7..8959ef78 100644 --- a/puppet/modules/obfsproxy/templates/etc_conf.erb +++ b/puppet/modules/obfsproxy/templates/etc_conf.erb @@ -2,11 +2,10 @@ TRANSPORT=<%= @transport %> PORT=<%= @port %> DEST_IP=<%= @dest_ip %> DEST_PORT=<%= @dest_port %> -<% if @transport == "scramblesuit" %> +<% if @transport == "scramblesuit" -%> PARAM=--password=<%= @param %> -<% else %> +<% else -%> PARAM=<%= @param %> -<% end %> +<% end -%> LOG=<%= @log_level %> BINDADDR=<%= @bind_address %> - -- cgit v1.2.3