Please review pull request #55: (#10024) Update Puppet Dashboard Workers init script opened by (stahnma)
Description:
Minor fixes to dashboard-workers script. The script sources a sysconfig
file that uses DASHBOARD_HOME rather than DASHBOARD_ROOT, so this script
has been updated to utilize the DASHBOARD_HOME env variable.
Additionally the sysconfig file had a value for the user to run the
processes as, but then was hard-coding the user-name. Script has been
updated to allow changing of username, as per the sysconfig file.
Signed-off-by: Michael Stahnke stah...@puppetlabs.com
- Opened: Mon Nov 14 16:45:45 UTC 2011
- Based on: puppetlabs:1.2rc (691c80b13a6a4bd6ac87d6385b66ee41d755fd9e)
- Requested merge: stahnma:1.2rc (2cb82dc72ebd73c69c28dcb51d854de00726595b)
Diff follows:
diff --git a/ext/packaging/redhat/puppet-dashboard-workers.init b/ext/packaging/redhat/puppet-dashboard-workers.init
index 200e9aa..076330a 100644
--- a/ext/packaging/redhat/puppet-dashboard-workers.init
+++ b/ext/packaging/redhat/puppet-dashboard-workers.init
@@ -12,7 +12,6 @@
. /etc/rc.d/init.d/functions
name=puppet-dashboard-workers
-# name=pe-dashboard-workers
# pull in sysconfig settings
# first the general dashboard settings, then the dedicated settings for
@@ -21,7 +20,7 @@ name=puppet-dashboard-workers
[ -f /etc/sysconfig/$name ] && . /etc/sysconfig/$name
# The default dashboard root if not set in sysconfig
-: ${DASHBOARD_ROOT:=/usr/share/puppet-dashboard}
+: ${DASHBOARD_HOME:=/usr/share/puppet-dashboard}
RETVAL=0
prog="${name}"
@@ -30,11 +29,11 @@ lockfile=/var/lock/subsys/$prog
start()
{
echo -n $"Starting $prog: "
- daemon --user puppet-dashboard "bash -e -c '
+ daemon --user $DAHSBOARD_USER "bash -e -c '
export PATH='${PATH}';
export RUBYLIB='${RUBYLIB:-}';
export RAILS_ENV=production;
- ${DASHBOARD_RUBY} ${DASHBOARD_ROOT}/script/delayed_job -p dashboard -n ${CPUS:-2} -m start;'"
+ ${DASHBOARD_RUBY} ${DASHBOARD_HOME}/script/delayed_job -p dashboard -n ${CPUS:-2} -m start;'"
RETVAL=$?
[ $RETVAL -eq 0 ] && touch $lockfile
echo
@@ -48,7 +47,7 @@ stop()
export PATH='${PATH}';
export RUBYLIB='${RUBYLIB}';
export RAILS_ENV=production;
- ${DASHBOARD_RUBY} ${DASHBOARD_ROOT}/script/delayed_job -p dashboard -n ${CPUS:-2} -m stop;"
+ ${DASHBOARD_RUBY} ${DASHBOARD_HOME}/script/delayed_job -p dashboard -n ${CPUS:-2} -m stop;"
RETVAL=$?
[ $RETVAL -eq 0 ] && (rm -f $lockfile; echo_success) || echo_failure
echo
@@ -61,7 +60,7 @@ restart() {
rh_status() {
RETVAL=1
- for pidfile in $(ls -1 "${DASHBOARD_ROOT}"/tmp/pids/delayed_job.*.pid 2>/dev/null)
+ for pidfile in $(ls -1 "${DASHBOARD_HOME}"/tmp/pids/delayed_job.*.pid 2>/dev/null)
do
status -p $pidfile puppet-dashboard-workers || return $?
RETVAL=$?
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
