[patch] problematic patch (against ejabberd 2.1.5)

inet-dist-interface.patch (text/plain), 2.37 KB, created by Max Arnold on 2011-02-12 18:43:20 UTC

diff -r ba2b36ddb0b7 doc/guide.tex
--- a/doc/guide.tex	Sat Feb 12 23:47:27 2011 +0600
+++ b/doc/guide.tex	Sun Feb 13 00:09:14 2011 +0600
@@ -4538,6 +4538,9 @@
 	If using \term{-sname}, specify either this option or \term{ERL\_INETRC}.
   \titem{-kernel inet\_dist\_listen\_min 4200 inet\_dist\_listen\_min 4210}
 	Define the first and last ports that \term{epmd} (section \ref{epmd}) can listen to.
+  \titem{-kernel inet\_dist\_use\_interface "\{ 127,0,0,1 \}"}
+	Define the IP address where this Erlang node listens for other nodes
+        connections (see section \ref{epmd}).
   \titem{-detached}
         Starts the Erlang system detached from the system console.
 	Useful for running daemons and backgrounds processes.
@@ -4950,6 +4953,12 @@
 \begin{verbatim}
 erl ... -kernel inet_dist_listen_min 4370 inet_dist_listen_max 4375
 \end{verbatim}
+It is also possible to configure in \term{ejabberdctl.cfg}
+the network interface where the Erlang node will listen and accept connections.
+The Erlang command-line parameter used internally is, for example:
+\begin{verbatim}
+erl ... -kernel inet_dist_use_interface "{127,0,0,1}"
+\end{verbatim}
 
 
 \makesection{cookie}{Erlang Cookie}
diff -r ba2b36ddb0b7 src/ejabberdctl.cfg.example
--- a/src/ejabberdctl.cfg.example	Sat Feb 12 23:47:27 2011 +0600
+++ b/src/ejabberdctl.cfg.example	Sun Feb 13 00:09:14 2011 +0600
@@ -51,6 +51,17 @@
 #FIREWALL_WINDOW=
 
 #.
+#' INET_DIST_INTERFACE: IP address where this Erlang node listens other nodes
+#
+# This communication is used by ejabberdctl command line tool,
+# and in a cluster of several ejabberd nodes.
+# Notice that the IP address must be specified in the Erlang syntax.
+#
+# Default: {127,0,0,1}
+#
+INET_DIST_INTERFACE={127,0,0,1}
+
+#.
 #' ERL_PROCESSES: Maximum number of Erlang processes
 #
 # Erlang consumes a lot of lightweight processes. If there is a lot of activity
diff -r ba2b36ddb0b7 src/ejabberdctl.template
--- a/src/ejabberdctl.template	Sat Feb 12 23:47:27 2011 +0600
+++ b/src/ejabberdctl.template	Sun Feb 13 00:09:14 2011 +0600
@@ -82,6 +82,10 @@
     KERNEL_OPTS="-kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
 fi
 
+if [ "$INET_DIST_INTERFACE" != "" ] ; then
+    KERNEL_OPTS+="-kernel inet_dist_use_interface \"${INET_DIST_INTERFACE}\""
+fi
+
 ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
 
 # define additional environment variables