diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2017-07-15 12:16:25 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2017-07-15 12:16:25 +0000 |
| commit | 4d5debd8a1c2efcbe860584d87c771d7dc856ee6 (patch) | |
| tree | 0c026555bef8544ed322835358ced0c3c531d1e6 /net-im/ejabberd/files | |
| parent | 4a1ae52bfa78585be0a6b02f955db1012bb1e7e6 (diff) | |
| download | freebsd-ports-4d5debd8a1c2efcbe860584d87c771d7dc856ee6.zip | |
- Import diff from ejabberd repository, commitid: d4cdc3a
- Add fix to make ejabberdctl work, when INET_DIST_INTERFACE is
defined. Submitted a pull-request upstream.
PR: 220627
Diffstat (limited to 'net-im/ejabberd/files')
| -rw-r--r-- | net-im/ejabberd/files/patch-ejabberdctl.template | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index a467eb736281..4b8214b1adbe 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -1,4 +1,4 @@ ---- ejabberdctl.template.orig 2017-07-10 09:25:01 UTC +--- ejabberdctl.template.orig 2017-07-15 11:43:57 UTC +++ ejabberdctl.template @@ -49,8 +49,8 @@ done @@ -11,8 +11,22 @@ : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml} : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg} [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" -@@ -72,7 +72,8 @@ if [ "$INET_DIST_INTERFACE" != "" ] ; th - ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface \"$INET_DIST_INTERFACE2\"" +@@ -62,17 +62,18 @@ done + # define erl parameters + ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS" + if [ "$FIREWALL_WINDOW" != "" ] ; then +- ERLANG_OPTS="$ERLANG_OPTS -kernel " \ +- "inet_dist_listen_min ${FIREWALL_WINDOW%-*} " \ +- "inet_dist_listen_max ${FIREWALL_WINDOW#*-}" ++ ERLANG_OPTS="$ERLANG_OPTS -kernel \ ++ inet_dist_listen_min ${FIREWALL_WINDOW%-*} \ ++ inet_dist_listen_max ${FIREWALL_WINDOW#*-}" + fi + if [ "$INET_DIST_INTERFACE" != "" ] ; then + INET_DIST_INTERFACE2=$("$ERL" -noshell -eval 'case inet:parse_address("'$INET_DIST_INTERFACE'") of {ok,IP} -> io:format("~p",[IP]); _ -> ok end.' -s erlang halt) + if [ "$INET_DIST_INTERFACE2" != "" ] ; then +- ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface \"$INET_DIST_INTERFACE2\"" ++ ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2" fi fi -ERL_LIBS={{libdir}} |