Commit 4ef5bcde authored by Johan Oudinet's avatar Johan Oudinet Committed by Thomas Petazzoni
Browse files

ejabberd: simplify init script by patching ejabberdctl 



Let a user modify environment variables used in ejabberdctl by loading
a default configuration file.

Signed-off-by: default avatarJohan Oudinet <johan.oudinet@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 390e778d

package/ejabberd/0009-fix-ejabberdctl.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Description: fix ejabberdctl

 Change default values so ejabberdctl run commands as ejabberd user

 Also add a way for the user to change default values.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>



diff --git a/ejabberdctl.template b/ejabberdctl.template

index 79f4438..df0abba 100755

--- a/ejabberdctl.template

+++ b/ejabberdctl.template

@@ -14,7 +14,10 @@ SCRIPT_DIR=`cd ${0%/*} && pwd`

 ERL={{erl}}

 IEX={{bindir}}/iex

 EPMD={{bindir}}/epmd

-INSTALLUSER={{installuser}}

+INSTALLUSER=ejabberd

+

+# Read default configuration file if present.

+[ ! -r /etc/default/ejabberd ] || . /etc/default/ejabberd

 

 # check the proper system user is used if defined

 if [ "$INSTALLUSER" != "" ] ; then

package/ejabberd/S50ejabberd

+14 −18
Original line number Diff line number Diff line
@@ -3,30 +3,26 @@ 
# Start/stop ejabberd

#



NAME=ejabberd

USER=ejabberd

CTL=/usr/sbin/ejabberdctl

DEFAULT=/etc/default/ejabberd

INSTALLUSER=ejabberd

RUNDIR=/var/run/ejabberd

SPOOLDIR=/var/lib/ejabberd



# Read configuration variable file if it is present.

[ -r /etc/default/$NAME ] && . /etc/default/$NAME

# Read default configuration file if present.

[ -r "$DEFAULT" ] && . "$DEFAULT"



# Create RUNDIR.

mkrundir() {

    install -d -o "$USER" -g "$USER" "$RUNDIR" "$SPOOLDIR"

}



# Run ejabberdctl as user $USER.

ctl() {

    su $USER -c "ejabberdctl $*"

    install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR"

}



case "$1" in

    start)

        mkrundir || exit 1

        echo -n "Starting ejabberd... "

        ctl start --spool "$SPOOLDIR"

        "$CTL" start

        # Wait until ejabberd is up and running.

        if ctl started; then

        if "$CTL" started; then

            echo "done"

        else

            echo "failed"
@@ -34,23 +30,23 @@ case "$1" in 
        ;;

    stop)

        echo -n "Stopping ejabberd... "

        ctl stop > /dev/null

        if [ $? -eq 3 ] || ctl stopped; then

        "$CTL" stop > /dev/null

        if [ $? -eq 3 ] || "$CTL" stopped; then

            echo "OK"

        else

            echo "failed"

        fi

        ;;

    status)

        ctl status

        "$CTL" status

        ;;

    restart|force-reload)

        "$0" stop

        "$0" stop || true

        "$0" start

        ;;

    live)

        mkrundir || exit 1

        ctl live

        "$CTL" live

        ;;

    *)

        echo "Usage: $0 {start|stop|status|restart|force-reload|live}"