[PATCH] Make sure all of our services use DCLOUD_USER. - deltacloud-devel - Fedora mailing-lists

19 Oct 2010

This is the same problem I fixed earlier for the
aggregator, just applied to all of our daemons.
Signed-off-by: Chris Lalancette clalance@redhat.com
---
 conf/deltacloud-aggregator            |    6 +++---
 conf/deltacloud-aggregator.sysconf    |    4 ++--
 conf/deltacloud-condor_refreshd       |    5 ++---
 conf/deltacloud-dbomatic              |    5 ++---
 conf/deltacloud-image_builder_service |    5 ++---
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/conf/deltacloud-aggregator b/conf/deltacloud-aggregator
index 2fb1bce..d30dc86 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 }"
-THIN_USER="${THIN_USER:-dcloud}"
-THIN_GROUP="${THIN_GROUP:-dcloud}"
+DCLOUD_USER="${DCLOUD_USER:-dcloud}"
+DCLOUD_GROUP="${DCLOUD_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 $THIN_USER --group $THIN_GROUP \
+	-a $ADDR -e $RAILS_ENV --user $DCLOUD_USER --group $DCLOUD_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 4bf79e9..0959ed1 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
-#THIN_USER=dcloud
-#THIN_GROUP=dcloud
+#DCLOUD_USER=dcloud
+#DCLOUD_GROUP=dcloud
# URL prefix for Rails application
 #PREFIX=/deltacloud
diff --git a/conf/deltacloud-condor_refreshd b/conf/deltacloud-condor_refreshd
index 6c0b6d5..c991f37 100755
--- a/conf/deltacloud-condor_refreshd
+++ b/conf/deltacloud-condor_refreshd
@@ -15,8 +15,7 @@ DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}"
 REFRESHD_LOG="${REFRESHD_LOG:-/var/log/deltacloud-aggregator/condor_refreshd.log}"
 REFRESHD_PID="${REFRESHD_PID:-/var/run/deltacloud-aggregator/condor_refreshd.pid}"
 REFRESHD_LOCKFILE="${REFRESHD_LOCKFILE:-/var/lock/subsys/deltacloud-condor_refreshd}"
-USER="${USER:-dcloud}"
-GROUP="${GROUP:-dcloud}"
+DCLOUD_USER="${DCLOUD_USER:-dcloud}"
REFRESHD_PATH=/usr/share/deltacloud-aggregator/condor_refreshd
 REFRESHD_PROG=condor_refreshd
@@ -27,7 +26,7 @@ REFRESHD_PID=/var/run/deltacloud-aggregator/condor_refreshd.pid
 start() {
     echo -n "Starting deltacloud-condor_refreshd: "
-    daemon --user=$USER $REFRESHD_PATH/$REFRESHD_PROG
+    daemon --user=$DCLOUD_USER $REFRESHD_PATH/$REFRESHD_PROG
     RETVAL=$?
     if [ $RETVAL -eq 0 ] && touch $REFRESHD_LOCKFILE ; then
       echo_success
diff --git a/conf/deltacloud-dbomatic b/conf/deltacloud-dbomatic
index 8a50098..782231b 100755
--- a/conf/deltacloud-dbomatic
+++ b/conf/deltacloud-dbomatic
@@ -15,8 +15,7 @@ DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}"
 DBOMATIC_LOG="${DBOMATIC_LOG:-/var/log/deltacloud-aggregator/dbomatic.log}"
 DBOMATIC_PID="${DBOMATIC_PID:-/var/run/deltacloud-aggregator/dbomatic.pid}"
 DBOMATIC_LOCKFILE="${DBOMATIC_LOCKFILE:-/var/lock/subsys/deltacloud-dbomatic }"
-USER="${USER:-dcloud}"
-GROUP="${GROUP:-dcloud}"
+DCLOUD_USER="${DCLOUD_USER:-dcloud}"
DBOMATIC_PATH=/usr/share/deltacloud-aggregator/dbomatic
 DBOMATIC_PROG=dbomatic
@@ -27,7 +26,7 @@ DBOMATIC_PID=/var/run/deltacloud-aggregator/dbomatic.pid
 start() {
     echo -n "Starting deltacloud-dbomatic: "
-    daemon --user=$USER $DBOMATIC_PATH/$DBOMATIC_PROG
+    daemon --user=$DCLOUD_USER $DBOMATIC_PATH/$DBOMATIC_PROG
     RETVAL=$?
     if [ $RETVAL -eq 0 ] && touch $DBOMATIC_LOCKFILE ; then
       echo_success
diff --git a/conf/deltacloud-image_builder_service b/conf/deltacloud-image_builder_service
index ecffb43..ee2f4ac 100755
--- a/conf/deltacloud-image_builder_service
+++ b/conf/deltacloud-image_builder_service
@@ -15,8 +15,7 @@ DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}"
 BUILDER_LOG="${BUILDER_LOG:-/var/log/deltacloud-aggregator/image_builder_service.log}"
 BUILDER_PID="${BUILDER_PID:-/var/run/deltacloud-aggregator/image_builder_service.pid}"
 BUILDER_LOCKFILE="${BUILDER_LOCKFILE:-/var/lock/subsys/deltacloud-image_builder_service}"
-USER="${USER:-dcloud}"
-GROUP="${GROUP:-dcloud}"
+DCLOUD_USER="${DCLOUD_USER:-dcloud}"
BUILDER_PATH=/usr/share/deltacloud-aggregator/image_builder_service
 BUILDER_PROG=image_builder_service
@@ -26,7 +25,7 @@ BUILDER_PROG=image_builder_service
 start() {
     echo -n "Starting deltacloud-image_builder_service: "
-    daemon --user=$USER $BUILDER_PATH/$BUILDER_PROG
+    daemon --user=$DCLOUD_USER $BUILDER_PATH/$BUILDER_PROG
     RETVAL=$?
     if [ $RETVAL -eq 0 ] && touch $BUILDER_LOCKFILE ; then
       echo_success
-- 
1.7.3.1


    