Otherwise, when running the script directly through /etc/init.d/deltacloud-aggregator, thin would pick up the user and group from the environment, which is not what we want.
Signed-off-by: Chris Lalancette <[email protected]> --- conf/deltacloud-aggregator | 6 +++--- conf/deltacloud-aggregator.sysconf | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/deltacloud-aggregator b/conf/deltacloud-aggregator index dedae1a..2fb1bce 100755 --- a/conf/deltacloud-aggregator +++ b/conf/deltacloud-aggregator @@ -17,8 +17,8 @@ DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}" THIN_LOG="${THIN_LOG:-/var/log/deltacloud-aggregator/thin.log}" THIN_PID="${THIN_PID:-/var/run/deltacloud-aggregator/thin.pid}" THIN_LOCKFILE="${THIN_LOCKFILE:-/var/lock/subsys/deltacloud-aggregator }" -USER="${USER:-dcloud}" -GROUP="${GROUP:-dcloud}" +THIN_USER="${THIN_USER:-dcloud}" +THIN_GROUP="${THIN_GROUP:-dcloud}" PREFIX="${PREFIX:-/deltacloud}" ADAPTER="${ADAPTER:-rails}" @@ -32,7 +32,7 @@ start() { echo -n "Starting deltacloud-aggregator: " $THIN_PROG start -c $DELTACLOUD_DIR -l $THIN_LOG -P $THIN_PID \ - -a $ADDR -e $RAILS_ENV --user $USER --group $GROUP \ + -a $ADDR -e $RAILS_ENV --user $THIN_USER --group $THIN_GROUP \ -d --prefix=$PREFIX -A $ADAPTER RETVAL=$? if [ $RETVAL -eq 0 ] && touch $THIN_LOCKFILE ; then diff --git a/conf/deltacloud-aggregator.sysconf b/conf/deltacloud-aggregator.sysconf index 73ff168..4bf79e9 100644 --- a/conf/deltacloud-aggregator.sysconf +++ b/conf/deltacloud-aggregator.sysconf @@ -11,8 +11,8 @@ #THIN_PID=/var/run/deltacloud-aggregator/thin.pid # user and group under which Rails application runs -#USER=dcloud -#GROUP=dcloud +#THIN_USER=dcloud +#THIN_GROUP=dcloud # URL prefix for Rails application #PREFIX=/deltacloud -- 1.7.2.3 _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
