New ERL_EPMD_ADDRESS that works since Erlang/OTP R14B03

diff --git a/doc/guide.tex b/doc/guide.tex
index ba403ce2a86f74af541821f1f81a74d05410f4ca..8d78f1366fff5c01b184dba00514ccc1d78fd4bc 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -5023,6 +5023,8 @@ The environment variables:
        This path is used to read the file \term{.erlang.cookie}.
   \titem{ERL\_CRASH\_DUMP}
        Path to the file where crash reports will be dumped.
+  \titem{ERL\_EPMD\_ADDRESS}
+       IP address where epmd listens for connections (see section \ref{epmd}).
   \titem{ERL\_INETRC}
        Indicates which IP name resolution to use.
        If using \term{-sname}, specify either this option or \term{-kernel inetrc filepath}.
@@ -5444,6 +5446,8 @@ In order for this communication to work,
 \term{epmd} must be running and listening for name requests in the port 4369.
 You should block the port 4369 in the firewall in such a way that
 only the programs in your machine can access it.
+or configure the option \term{ERL\_EPMD\_ADDRESS} in the file \term{ejabberdctl.cfg}
+(this option works only in Erlang/OTP R14B03 or higher).
 
 If you build a cluster of several \ejabberd{} instances,
 each \ejabberd{} instance is called an \ejabberd{} node.

diff --git a/src/ejabberdctl.cfg.example b/src/ejabberdctl.cfg.example
index 2106e3d2200d2f07a723273a7f8178202c9dd2da..3f116d180b185ad5f07a2881eaaa2e13c20696e0 100644 (file)
--- a/src/ejabberdctl.cfg.example
+++ b/src/ejabberdctl.cfg.example
@@ -61,6 +61,22 @@
 #
 INET_DIST_INTERFACE={127,0,0,1}
 
+#.
+#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
+#
+# IMPORTANT: This option works only in Erlang/OTP R14B03 and newer.
+#
+# This environment variable may be set to a comma-separated
+# list of IP addresses, in which case the epmd daemon
+# will listen only on the specified address(es) and on the
+# loopback address (which is implicitly added to the list if it
+# has not been specified). The default behaviour is to listen on
+# all available IP addresses.
+#
+# Default: 0.0.0.0
+#
+#ERL_EPMD_ADDRESS=127.0.0.1
+
 #.
 #' ERL_PROCESSES: Maximum number of Erlang processes
 #

diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index cdedeba37e66b122a1d67b9b4d8bc75375d5acb6..012777e92cca1b8a90585c39533462e0db497b60 100644 (file)
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -133,6 +133,7 @@ export EJABBERD_BIN_PATH
 export EJABBERD_DOC_PATH
 export EJABBERD_PID_PATH
 export ERL_CRASH_DUMP
+export ERL_EPMD_ADDRESS
 export ERL_INETRC
 export ERL_MAX_PORTS
 export ERL_MAX_ETS_TABLES