From 89e54ac90a652d7f2eb4561923d25afae4ff3e8c Mon Sep 17 00:00:00 2001 From: Deoren Moor Date: Wed, 19 Aug 2015 08:59:11 -0500 Subject: [PATCH] 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. --- contrib/httpuploadcomponent | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/httpuploadcomponent b/contrib/httpuploadcomponent index 33e80e6..c470dd5 100755 --- a/contrib/httpuploadcomponent +++ b/contrib/httpuploadcomponent @@ -20,11 +20,12 @@ CONFIG=/etc/prosody/HttpUploadComponent.yml LOGFILE=/var/log/prosody/httpuploadcomponent.log PIDFILE=/var/run/${NAME}.pid USER=prosody -export LOGNAME=$USER # Allow user to override default values listed above [ -r /etc/default/$NAME ] && . /etc/default/$NAME +export LOGNAME=$USER + test -x $DAEMON || exit 0 set -e