Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Merge branch 'master' of github.com:processone/ejabberd

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2014-07-27 13:06:46 +04:00
commit c0001184fd
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
/Makefile /Makefile
/config.log /config.log
/config.status /config.status
/configure
/aclocal.m4 /aclocal.m4
/contrib/extract_translations/extract_translations.beam /contrib/extract_translations/extract_translations.beam
/*.cache /*.cache

2
doc/Makefile
View File

@ -1,6 +1,6 @@
# $Id$ # $Id$
SHELL = /bin/bash SHELL = /bin/sh
CONTRIBUTED_MODULES = "" CONTRIBUTED_MODULES = ""
#ifeq ($(shell ls mod_http_bind.tex),mod_http_bind.tex) #ifeq ($(shell ls mod_http_bind.tex),mod_http_bind.tex)

18
ejabberdctl.template
View File

@ -22,7 +22,16 @@ if [ "$INSTALLUSER" != "" ] ; then
EXEC_CMD="false" EXEC_CMD="false"
for GID in `id -G`; do for GID in `id -G`; do
if [ $GID -eq 0 ] ; then if [ $GID -eq 0 ] ; then
EXEC_CMD="su $INSTALLUSER -p -c" INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
if [ -z "$INSTALLUSER_HOME" ] ; then
echo "Cannot determine home directory of $INSTALLUSER" >&2
exit 1
fi
if [ ! -d "$INSTALLUSER_HOME" ] ; then
mkdir -p "$INSTALLUSER_HOME"
chown "$INSTALLUSER" "$INSTALLUSER_HOME"
fi
EXEC_CMD="env HOME=$INSTALLUSER_HOME su $INSTALLUSER -p -c"
fi fi
done done
if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
@ -142,14 +151,7 @@ fi
[ -z "$date" ] || EJABBERD_OPTS="${EJABBERD_OPTS} log_rotate_date '$date'" [ -z "$date" ] || EJABBERD_OPTS="${EJABBERD_OPTS} log_rotate_date '$date'"
[ -z "$EJABBERD_OPTS" ] || EJABBERD_OPTS="-ejabberd ${EJABBERD_OPTS}" [ -z "$EJABBERD_OPTS" ] || EJABBERD_OPTS="-ejabberd ${EJABBERD_OPTS}"
# create the ejabberd home dir with the proper user if doesn't exist
# then change to that directory readable by INSTALLUSER to
# prevent "File operation error: eacces." messages
[ -d $HOME ] || $EXEC_CMD "mkdir -p $HOME"
[ -d $SPOOL_DIR ] || $EXEC_CMD "mkdir -p $SPOOL_DIR" [ -d $SPOOL_DIR ] || $EXEC_CMD "mkdir -p $SPOOL_DIR"
# then set SPOOL_DIR as ejabberd home directory by changing
# to that directory readable by INSTALLUSER to prevent
# "File operation error: eacces." messages
cd $SPOOL_DIR cd $SPOOL_DIR
# export global variables # export global variables