Reference include file before exporting $USER

We should check for and pull in the include file before exporting `$USER` in case the user has opted to override the default setting.
This commit is contained in:
Deoren Moor 2015-08-19 08:59:11 -05:00
parent 3beabfcc9f
commit 89e54ac90a

View File

@ -20,11 +20,12 @@ CONFIG=/etc/prosody/HttpUploadComponent.yml
LOGFILE=/var/log/prosody/httpuploadcomponent.log LOGFILE=/var/log/prosody/httpuploadcomponent.log
PIDFILE=/var/run/${NAME}.pid PIDFILE=/var/run/${NAME}.pid
USER=prosody USER=prosody
export LOGNAME=$USER
# Allow user to override default values listed above # Allow user to override default values listed above
[ -r /etc/default/$NAME ] && . /etc/default/$NAME [ -r /etc/default/$NAME ] && . /etc/default/$NAME
export LOGNAME=$USER
test -x $DAEMON || exit 0 test -x $DAEMON || exit 0
set -e set -e