diff options
Diffstat (limited to 'net-im/ejabberd/files/patch-ejabberdctl.template')
-rw-r--r-- | net-im/ejabberd/files/patch-ejabberdctl.template | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index 4b49be468b60..98a1dc839cee 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -3,20 +3,20 @@ $FreeBSD$ --- ejabberdctl.template.orig +++ ejabberdctl.template -@@ -68,10 +68,10 @@ - EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml +@@ -67,10 +67,10 @@ + EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml fi if [ "$LOGS_DIR" = "" ] ; then - LOGS_DIR={{localstatedir}}/log/ejabberd -+ LOGS_DIR=/var/log/ejabberd ++ LOGS_DIR=/var/log/ejabberd fi - if [ "$SPOOLDIR" = "" ] ; then -- SPOOLDIR={{localstatedir}}/lib/ejabberd -+ SPOOLDIR=/var/spool/ejabberd + if [ "$SPOOL_DIR" = "" ] ; then +- SPOOL_DIR={{localstatedir}}/lib/ejabberd ++ SPOOLDIR=/var/spool/ejabberd fi if [ "$EJABBERD_DOC_PATH" = "" ] ; then EJABBERD_DOC_PATH={{docdir}} -@@ -85,10 +85,10 @@ +@@ -84,10 +84,10 @@ EJABBERDDIR={{libdir}}/ejabberd fi if [ "$EJABBERD_EBIN_PATH" = "" ] ; then @@ -29,3 +29,12 @@ $FreeBSD$ fi if [ "$EJABBERD_BIN_PATH" = "" ] ; then EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin +@@ -281,7 +281,7 @@ + # using flock if available. Expects a linux-style + # flock that can lock a file descriptor. + MAXCONNID=100 +- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl ++ CONNLOCKDIR={{localstatedir}}/run/ejabberdctl + FLOCK='/usr/bin/flock' + if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then + JOT='/usr/bin/jot' |