From c7dc1bdb194bc455f1fbb6a1b941275855a042d7 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 20 Dec 2006 14:40:09 +0000 Subject: make rpm in cpp directory builds qpidc RPMs in default locations. Note: you need to chown or chmod the directories under /usr/src/redhat/RPMS/i386 to be writable for this to work, there is probably a better solution. Building RPMs as root is a Bad Idea. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@489103 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 qpid/cpp/etc/qpidd (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd new file mode 100755 index 0000000000..0c6041b063 --- /dev/null +++ b/qpid/cpp/etc/qpidd @@ -0,0 +1,83 @@ +#!/bin/bash +# +# qpidd Startup script for the Qpid messaging daemon. +# +# chkconfig: - 85 15 +# description: Qpidd is an AMQP broker. It receives, stores and routes +# messages sent using the AMQP protcol. +# processname: qpidd +# pidfile: /var/run/qpidd.pid +# +# NB: add config: entries here when qpidd gets a config file. + +# Source function library. +. /etc/rc.d/init.d/functions + +if [ -f /etc/sysconfig/qpidd ]; then + . /etc/sysconfig/qpidd +fi + +# Start qpidd in the C locale by default. +QPIDD_LANG=${QPIDD_LANG-"C"} + +qpidd=${QPIDD-/usr/sbin/qpidd} +prog=qpidd +pidfile=${PIDFILE-/var/run/qpidd.pid} +lockfile=${LOCKFILE-/var/lock/subsys/qpidd} +RETVAL=0 + +start() { + echo -n $"Starting $prog: " + LANG=$QPIDD_LANG daemon $qpidd $OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n $"Stopping $prog: " + killproc 2 $qpidd + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} +} + +reload() { + echo -n $"Reloading $prog: " + killproc $qpidd -HUP + RETVAL=$? + echo +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $qpidd + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + if [ -f ${pidfile} ] ; then + stop + start + fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}" + exit 1 +esac + +exit $RETVAL -- cgit v1.2.1 From 1a5f3f72cc85d88e23d47d4b7ccb52c281205942 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sat, 23 Dec 2006 17:20:37 +0000 Subject: - rpm: make rpm now builds RPMs under rpm/ directory. - src/qpidd.cpp: added --daemon option to run as daemon. - etc/qpidd: fixed bugs in init.rc script. - qpidc.spec: fixed rpmlint warnings, added apache URL git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@489905 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 49 ++++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 0c6041b063..cfd6049c9b 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -3,32 +3,21 @@ # qpidd Startup script for the Qpid messaging daemon. # # chkconfig: - 85 15 -# description: Qpidd is an AMQP broker. It receives, stores and routes -# messages sent using the AMQP protcol. +# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. # processname: qpidd -# pidfile: /var/run/qpidd.pid # -# NB: add config: entries here when qpidd gets a config file. + +prog=qpidd +lockfile=/var/lock/subsys/$prog # Source function library. . /etc/rc.d/init.d/functions -if [ -f /etc/sysconfig/qpidd ]; then - . /etc/sysconfig/qpidd -fi - -# Start qpidd in the C locale by default. -QPIDD_LANG=${QPIDD_LANG-"C"} - -qpidd=${QPIDD-/usr/sbin/qpidd} -prog=qpidd -pidfile=${PIDFILE-/var/run/qpidd.pid} -lockfile=${LOCKFILE-/var/lock/subsys/qpidd} RETVAL=0 start() { - echo -n $"Starting $prog: " - LANG=$QPIDD_LANG daemon $qpidd $OPTIONS + echo -n $"Starting Qpid AMQP daemon: " + daemon $prog --daemon RETVAL=$? echo [ $RETVAL = 0 ] && touch ${lockfile} @@ -36,18 +25,16 @@ start() { } stop() { - echo -n $"Stopping $prog: " - killproc 2 $qpidd + echo -n $"Stopping Qpid AMQP daemon: " + killproc $prog RETVAL=$? echo [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} } -reload() { - echo -n $"Reloading $prog: " - killproc $qpidd -HUP - RETVAL=$? - echo +restart() { + stop + start } # See how we were called. @@ -59,24 +46,20 @@ case "$1" in stop ;; status) - status $qpidd + status $prog RETVAL=$? ;; - restart) - stop - start + restart|reload) + restart ;; condrestart) - if [ -f ${pidfile} ] ; then - stop - start - fi + if [ -e $lockfile ] ; then restart ; fi ;; reload) reload ;; *) - echo $"Usage: $prog {start|stop|restart|condrestart|reload|status}" + echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" exit 1 esac -- cgit v1.2.1 From 732544fe86089ab86c03fcc48d5ca4c72667c275 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Mar 2007 02:05:56 +0000 Subject: * cpp: svn removed, will rename cpp-0-9 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@520705 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 66 ------------------------------------------------------ 1 file changed, 66 deletions(-) delete mode 100755 qpid/cpp/etc/qpidd (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd deleted file mode 100755 index cfd6049c9b..0000000000 --- a/qpid/cpp/etc/qpidd +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# -# qpidd Startup script for the Qpid messaging daemon. -# -# chkconfig: - 85 15 -# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. -# processname: qpidd -# - -prog=qpidd -lockfile=/var/lock/subsys/$prog - -# Source function library. -. /etc/rc.d/init.d/functions - -RETVAL=0 - -start() { - echo -n $"Starting Qpid AMQP daemon: " - daemon $prog --daemon - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL -} - -stop() { - echo -n $"Stopping Qpid AMQP daemon: " - killproc $prog - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} -} - -restart() { - stop - start -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $prog - RETVAL=$? - ;; - restart|reload) - restart - ;; - condrestart) - if [ -e $lockfile ] ; then restart ; fi - ;; - reload) - reload - ;; - *) - echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" - exit 1 -esac - -exit $RETVAL -- cgit v1.2.1 From d2eb3361494710466280341c98f76c03536d2ebe Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Mar 2007 02:08:18 +0000 Subject: Renamed cpp-0-9 to cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@520706 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100755 qpid/cpp/etc/qpidd (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd new file mode 100755 index 0000000000..cfd6049c9b --- /dev/null +++ b/qpid/cpp/etc/qpidd @@ -0,0 +1,66 @@ +#!/bin/bash +# +# qpidd Startup script for the Qpid messaging daemon. +# +# chkconfig: - 85 15 +# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. +# processname: qpidd +# + +prog=qpidd +lockfile=/var/lock/subsys/$prog + +# Source function library. +. /etc/rc.d/init.d/functions + +RETVAL=0 + +start() { + echo -n $"Starting Qpid AMQP daemon: " + daemon $prog --daemon + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n $"Stopping Qpid AMQP daemon: " + killproc $prog + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} +} + +restart() { + stop + start +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status $prog + RETVAL=$? + ;; + restart|reload) + restart + ;; + condrestart) + if [ -e $lockfile ] ; then restart ; fi + ;; + reload) + reload + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" + exit 1 +esac + +exit $RETVAL -- cgit v1.2.1 From f05f30bf883e66a5281847ccb1094f0a921de6aa Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 9 Jul 2007 14:26:42 +0000 Subject: Update for Fedora init-scripts guidelines: * etc/qpidd: Provide an LSB header. Allow options to be specified via QPIDD_OPTIONS=... in /etc/sysconfig/qpidd. Diagnose and 'exit 3' for the unsupported "reload". Don't mention unused $pidfile. Remove useless curly braces: ${lockfile} -> $lockfile. Write usage and error diagnostics to stderr, not stdout. Change spelling: condrestart -> try-restart. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@554659 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 57 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 21 deletions(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index cfd6049c9b..ed9a3ececb 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -2,10 +2,21 @@ # # qpidd Startup script for the Qpid messaging daemon. # + +### BEGIN INIT INFO +# Provides: qpidd +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start or stop qpidd +# Description: Qpidd is an AMQP broker. It receives, stores, routes and +# forwards messages using the AMQP protcol. +### END INIT INFO + # chkconfig: - 85 15 # description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. # processname: qpidd -# prog=qpidd lockfile=/var/lock/subsys/$prog @@ -13,15 +24,20 @@ lockfile=/var/lock/subsys/$prog # Source function library. . /etc/rc.d/init.d/functions +QPIDD_OPTIONS= +if [ -f /etc/sysconfig/$prog ] ; then + . /etc/sysconfig/$prog +fi + RETVAL=0 start() { - echo -n $"Starting Qpid AMQP daemon: " - daemon $prog --daemon - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL + echo -n $"Starting Qpid AMQP daemon: " + daemon --check $prog $prog --daemon $QPIDD_OPTIONS + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch $lockfile + return $RETVAL } stop() { @@ -29,7 +45,12 @@ stop() { killproc $prog RETVAL=$? echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} + [ $RETVAL = 0 ] && rm -f $lockfile +} + +reload() { + echo 1>&2 $"$0: reload not supported" + exit 3 } restart() { @@ -39,27 +60,21 @@ restart() { # See how we were called. case "$1" in - start) - start - ;; - stop) - stop + start|stop|restart|reload) + $1 ;; status) - status $prog + status $prog RETVAL=$? ;; - restart|reload) + force-reload) restart ;; - condrestart) - if [ -e $lockfile ] ; then restart ; fi - ;; - reload) - reload + try-restart) + [ -e $lockfile ] && restart || : ;; *) - echo $"Usage: $0 {start|stop|restart|condrestart|reload|status}" + echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac -- cgit v1.2.1 From ccc97ff1b41f0b952888b24735238b39e0fe882d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 20 Aug 2007 13:09:46 +0000 Subject: * qpidc.spec.in: Fix rpmlint "macro in changelog" warning. * etc/qpidd: Put description on one line. Continuation line causing rpmlint to barf with "wrong-line-in-lsb-tag * configure.ac: Fix typo. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@567683 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index ed9a3ececb..6aa79339d7 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -10,8 +10,7 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: start or stop qpidd -# Description: Qpidd is an AMQP broker. It receives, stores, routes and -# forwards messages using the AMQP protcol. +# Description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol. ### END INIT INFO # chkconfig: - 85 15 -- cgit v1.2.1 From ef54864bf80d631f4d24e5d6e81843c9ae27045a Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 3 Oct 2007 22:19:41 +0000 Subject: From Nuno Santos , fix options in qpidd startup script. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@581739 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 1 - 1 file changed, 1 deletion(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 6aa79339d7..821e50a9a2 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -23,7 +23,6 @@ lockfile=/var/lock/subsys/$prog # Source function library. . /etc/rc.d/init.d/functions -QPIDD_OPTIONS= if [ -f /etc/sysconfig/$prog ] ; then . /etc/sysconfig/$prog fi -- cgit v1.2.1 From d376cf7c6d58f27aa38f4f986e87f9579816e255 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Tue, 1 Apr 2008 15:23:01 +0000 Subject: QPID-892: Make qpidd daemon not run as root (rpm install) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@643442 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 821e50a9a2..55d885ef66 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -31,7 +31,7 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --check $prog $prog --daemon $QPIDD_OPTIONS + daemon --check $prog "runuser -s /bin/sh qpidd -c \"$prog --daemon $QPIDD_OPTIONS\"" RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile -- cgit v1.2.1 From eb34891fb4886a975039df3aa58ecbffa299acd6 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Tue, 1 Apr 2008 21:41:23 +0000 Subject: QPID-892 - use daemon params instead of runuser; store pid of qpidd daemon to kill single instance git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@643597 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 55d885ef66..d9076191d6 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -19,6 +19,7 @@ prog=qpidd lockfile=/var/lock/subsys/$prog +pidfile=/var/run/qpidd.pid # Source function library. . /etc/rc.d/init.d/functions @@ -31,19 +32,24 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --check $prog "runuser -s /bin/sh qpidd -c \"$prog --daemon $QPIDD_OPTIONS\"" + daemon --pidfile $pidfile --check $prog --user qpidd $prog --daemon $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile + if [ $RETVAL = 0 ]; then + touch $pidfile + chown qpidd.qpidd $pidfile + runuser -s /bin/sh qpidd -c "qpidd -c > $pidfile" + fi return $RETVAL } stop() { echo -n $"Stopping Qpid AMQP daemon: " - killproc $prog + killproc -p ${pidfile} $prog RETVAL=$? echo - [ $RETVAL = 0 ] && rm -f $lockfile + [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} } reload() { -- cgit v1.2.1 From b5202b04f4fffdd22f5815485f075225d614bd73 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Thu, 17 Apr 2008 14:31:01 +0000 Subject: add full path to qpidd in init script, as it fails in some environments with just the command name git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@649126 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index d9076191d6..aae65853cb 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -32,7 +32,7 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --pidfile $pidfile --check $prog --user qpidd $prog --daemon $QPIDD_OPTIONS + daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile -- cgit v1.2.1 From a3c4c567d0d1c616f3f9fcefe12f5c24d71a27c6 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Mon, 2 Jun 2008 21:20:35 +0000 Subject: QPID-1114 Daemon mode improvements git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662570 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index aae65853cb..62b92b223a 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -39,7 +39,7 @@ start() { if [ $RETVAL = 0 ]; then touch $pidfile chown qpidd.qpidd $pidfile - runuser -s /bin/sh qpidd -c "qpidd -c > $pidfile" + runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" fi return $RETVAL } -- cgit v1.2.1 From 689ad38a3f4c5ff468bc3c7ae095019f79c97f9d Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Tue, 3 Jun 2008 15:13:01 +0000 Subject: QPID-1114 moved --pid-dir from config file to startup script git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662821 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 62b92b223a..1071ddbffe 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -32,14 +32,14 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon $QPIDD_OPTIONS + daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile if [ $RETVAL = 0 ]; then touch $pidfile chown qpidd.qpidd $pidfile - runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" + runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile" fi return $RETVAL } -- cgit v1.2.1 From a60d332b358f41205f1f862dc2de9d15b2802ded Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Tue, 3 Jun 2008 18:19:29 +0000 Subject: QPID-1114 Change defaults for data-dir and pid-dir to /home/ross/.qpidd git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662854 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 1071ddbffe..912cd64ecb 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -32,7 +32,7 @@ RETVAL=0 start() { echo -n $"Starting Qpid AMQP daemon: " - daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd $QPIDD_OPTIONS + daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile -- cgit v1.2.1 From c576dfafe5f336c51e277e9961c200b1d1723b17 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 15 Dec 2008 11:21:43 +0000 Subject: Added missing ASF license to conf files and init script git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@726681 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 912cd64ecb..f168430069 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -1,5 +1,23 @@ #!/bin/bash # +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# # qpidd Startup script for the Qpid messaging daemon. # -- cgit v1.2.1 From d50c0097f81d4a026d6345a29b8a94c157e53d27 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 29 Oct 2009 10:17:45 +0000 Subject: condrestart was mentioned in usage but not supported in case; made it a synonym for existing try-restart. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@830879 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index f168430069..8e6e74b33c 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -92,7 +92,7 @@ case "$1" in force-reload) restart ;; - try-restart) + try-restart|condrestart) [ -e $lockfile ] && restart || : ;; *) -- cgit v1.2.1 From 2ed9600279e9b84584f6013f63ff3aa58a6225e0 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Mon, 19 Apr 2010 15:44:02 +0000 Subject: Add restorecon to qpid init script to allow SELinux to correctly handle pidfile attributes git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@935629 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index 8e6e74b33c..b4118f0866 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -57,6 +57,7 @@ start() { if [ $RETVAL = 0 ]; then touch $pidfile chown qpidd.qpidd $pidfile + [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile" fi return $RETVAL -- cgit v1.2.1 From 845fa1600142ab5c9b7b44589b3e531626e1393b Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 30 Apr 2010 16:01:11 +0000 Subject: Added a couple of tests to init script and use env var for data dir if set git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@939726 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index b4118f0866..f391da3cde 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -48,17 +48,31 @@ fi RETVAL=0 +#ensure binary is present and executable +if [[ !(-x /usr/sbin/$prog) ]] ; then + echo "/usr/sbin/$prog not found or not executable" + exit 5 +fi + +#ensure user has sufficient permissions +runuser -s /bin/sh qpidd -c "echo x > /dev/null" 2> /dev/null || RETVAL=4 +if [ $RETVAL = 4 ]; then + echo "user had insufficient privilege"; + exit $RETVAL +fi + start() { - echo -n $"Starting Qpid AMQP daemon: " - daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS + [[ $QPID_DATA_DIR ]] || QPID_DATA_DIR=/var/lib/qpidd + echo -n $"Starting Qpid AMQP daemon: " + daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --data-dir $QPID_DATA_DIR --daemon $QPIDD_OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch $lockfile if [ $RETVAL = 0 ]; then touch $pidfile chown qpidd.qpidd $pidfile - [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile - runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile" + [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile + runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" fi return $RETVAL } @@ -97,8 +111,8 @@ case "$1" in [ -e $lockfile ] && restart || : ;; *) - echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 + echo 1>&2 $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|force-reload}" + exit 2 esac exit $RETVAL -- cgit v1.2.1 From 032866de5d7cccafac52faeaa333b9dae4811761 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 11 Jun 2010 12:49:52 +0000 Subject: QPID-2666: Fix for init script problem where config file has "log-to-file" set with a relative path. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@953687 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/etc/qpidd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/etc/qpidd') diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd index f391da3cde..07cbb825d5 100755 --- a/qpid/cpp/etc/qpidd +++ b/qpid/cpp/etc/qpidd @@ -72,7 +72,7 @@ start() { touch $pidfile chown qpidd.qpidd $pidfile [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile - runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" + runuser - -s /bin/sh qpidd -c "/usr/sbin/$prog --check > $pidfile" fi return $RETVAL } -- cgit v1.2.1