From 791e22b136910ecfa204eb78be747baed2b02590 Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
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/files/obfsproxy_init   | 2 +-
 puppet/modules/obfsproxy/manifests/init.pp      | 1 +
 puppet/modules/obfsproxy/templates/etc_conf.erb | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/obfsproxy')

diff --git a/puppet/modules/obfsproxy/files/obfsproxy_init b/puppet/modules/obfsproxy/files/obfsproxy_init
index 629fea9f..69dbab41 100755
--- a/puppet/modules/obfsproxy/files/obfsproxy_init
+++ b/puppet/modules/obfsproxy/files/obfsproxy_init
@@ -32,7 +32,7 @@ else
 fi
 
 DAEMONARGS=" --log-min-severity=$LOG --log-file=$LOGFILE --data-dir=$DATDIR \
-            $TRANSPORT $PARAM --dest=$DEST_IP:$DEST_PORT server 0.0.0.0:$PORT"
+            $TRANSPORT $PARAM --dest=$DEST_IP:$DEST_PORT server $BINDADDR:$PORT"
 
 start_obfsproxy() {
   start-stop-daemon --start --quiet --oknodo -m --pidfile $PIDFILE \
diff --git a/puppet/modules/obfsproxy/manifests/init.pp b/puppet/modules/obfsproxy/manifests/init.pp
index ddb198bb..35d47d13 100644
--- a/puppet/modules/obfsproxy/manifests/init.pp
+++ b/puppet/modules/obfsproxy/manifests/init.pp
@@ -1,5 +1,6 @@
 class obfsproxy (
   $transport,
+  $bind_address,
   $port,
   $param,
   $dest_ip,
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