Author: aconway
Date: Tue Mar 27 20:32:18 2012
New Revision: 1306007
URL: http://svn.apache.org/viewvc?rev=1306007&view=rev
Log:
QPID-3603: Substitute installation directories in qpidd init scripts.
Added:
qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml.in
- copied, changed from r1305928,
qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml
qpid/trunk/qpid/cpp/etc/qpidd-primary.in
- copied, changed from r1305928, qpid/trunk/qpid/cpp/etc/qpidd-primary
qpid/trunk/qpid/cpp/etc/qpidd.in
- copied, changed from r1305928, qpid/trunk/qpid/cpp/etc/qpidd
Removed:
qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml
qpid/trunk/qpid/cpp/etc/qpidd
qpid/trunk/qpid/cpp/etc/qpidd-primary
Modified:
qpid/trunk/qpid/cpp/etc/Makefile.am
qpid/trunk/qpid/cpp/src/tests/install_env.sh.in
Modified: qpid/trunk/qpid/cpp/etc/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/Makefile.am?rev=1306007&r1=1306006&r2=1306007&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/etc/Makefile.am Tue Mar 27 20:32:18 2012
@@ -20,9 +20,10 @@ SASL_CONF = sasl2/qpidd.conf
EXTRA_DIST = \
$(SASL_CONF) \
- qpidd qpidd-primary qpidd.conf qpidc.conf CMakeLists.txt
+ qpidd qpidd-primary qpidd.conf qpidc.conf CMakeLists.txt \
+ cluster.conf-example.xml
-confdir=$(sysconfdir)/qpid
+confdir = $(sysconfdir)/qpid
nobase_conf_DATA=\
qpidc.conf
@@ -35,5 +36,20 @@ nobase_sysconf_DATA += \
endif
+# Substitute values for directories in init scripts.
+#
+# We can't use autoconf substitution directly because it leaves
+# ${prefix} and ${exec_prefix} unexpanded. Substitute with sed
+# scripts.
+SUBST="s|!!sysconfdir!!|${sysconfdir}|;s|!!sbindir!!|${sbindir}|;s|!!bindir!!|${bindir}|"
+qpidd: qpidd.in
+ sed $(SUBST) $< > $@
+qpidd-primary: qpidd-primary.in
+ sed $(SUBST) $< > $@
+cluster.conf-example.xml: cluster.conf-example.in
+ sed $(SUBST) $< > $@
+
+CLEANFILES = qpidd qpidd-primary cluster.conf-example
+
initddir = $(sysconfdir)/init.d
nobase_initd_SCRIPTS = qpidd qpidd-primary
Copied: qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml.in (from r1305928,
qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml.in?p2=qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml.in&p1=qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml&r1=1305928&r2=1306007&rev=1306007&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml (original)
+++ qpid/trunk/qpid/cpp/etc/cluster.conf-example.xml.in Tue Mar 27 20:32:18 2012
@@ -32,11 +32,11 @@ This example assumes a 3 node cluster, w
</failoverdomains>
<resources>
- <!-- This script starts a qpidd broker initially acting as a backup. -->
- <script file="/etc/init.d/qpidd" name="qpidd"/>
+ <!-- This script starts a qpidd broker acting as a backup. -->
+ <script file="!!sysconfdir!!/init.d/qpidd" name="qpidd"/>
- <!-- This script promotes the qpidd broker to primary. -->
- <script file="/etc/init.d/qpidd-primary" name="qpidd-primary"/>
+ <!-- This script promotes the qpidd broker on this node to primary. -->
+ <script file="!!sysconfdir!!/init.d/qpidd-primary" name="qpidd-primary"/>
<!-- This is a virtual IP address for broker replication traffic. -->
<ip address="20.0.10.200" monitor_link="1"/>
@@ -67,4 +67,3 @@ This example assumes a 3 node cluster, w
<fencedevices/>
<fence_daemon clean_start="0" post_fail_delay="0" post_join_delay="3"/>
</cluster>
-
Copied: qpid/trunk/qpid/cpp/etc/qpidd-primary.in (from r1305928,
qpid/trunk/qpid/cpp/etc/qpidd-primary)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd-primary.in?p2=qpid/trunk/qpid/cpp/etc/qpidd-primary.in&p1=qpid/trunk/qpid/cpp/etc/qpidd-primary&r1=1305928&r2=1306007&rev=1306007&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/qpidd-primary (original)
+++ qpid/trunk/qpid/cpp/etc/qpidd-primary.in Tue Mar 27 20:32:18 2012
@@ -40,13 +40,13 @@ prog=qpidd
# Source function library.
. /etc/rc.d/init.d/functions
-if [ -f /etc/sysconfig/$prog ] ; then
- . /etc/sysconfig/$prog
+if [ -f !!sysconfdir!!/sysconfig/$prog ] ; then
+ . !!sysconfdir!!/sysconfig/$prog
fi
-# The following variables can be overridden in /etc/sysconfig/$prog
+# The following variables can be overridden in !!sysconfdir!!/sysconfig/$prog
[[ $QPID_PORT ]] || QPID_PORT=5672
-[[ $QPID_HA ]] || QPID_HA=/usr/bin/qpid-ha
+[[ $QPID_HA ]] || QPID_HA=!!bindir!!/qpid-ha
export QPID_PORT
RETVAL=0
Copied: qpid/trunk/qpid/cpp/etc/qpidd.in (from r1305928,
qpid/trunk/qpid/cpp/etc/qpidd)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/qpidd.in?p2=qpid/trunk/qpid/cpp/etc/qpidd.in&p1=qpid/trunk/qpid/cpp/etc/qpidd&r1=1305928&r2=1306007&rev=1306007&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/etc/qpidd (original)
+++ qpid/trunk/qpid/cpp/etc/qpidd.in Tue Mar 27 20:32:18 2012
@@ -42,15 +42,15 @@ pidfile=/var/run/qpidd.pid
# Source function library.
. /etc/rc.d/init.d/functions
-if [ -f /etc/sysconfig/$prog ] ; then
- . /etc/sysconfig/$prog
+if [ -f !!sysconfdir!!/sysconfig/$prog ] ; then
+ . !!sysconfdir!!/sysconfig/$prog
fi
RETVAL=0
#ensure binary is present and executable
-if [[ !(-x /usr/sbin/$prog) ]] ; then
- echo "/usr/sbin/$prog not found or not executable"
+if [[ !(-x !!sbindir!!/$prog) ]] ; then
+ echo "!!sbindir!!/$prog not found or not executable"
exit 5
fi
@@ -64,7 +64,7 @@ fi
start() {
[[ $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
+ daemon --pidfile $pidfile --check $prog --user qpidd !!sbindir!!/$prog
--data-dir $QPID_DATA_DIR --daemon $QPIDD_OPTIONS
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch $lockfile
@@ -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 "!!sbindir!!/$prog --check > $pidfile"
fi
return $RETVAL
}
Modified: qpid/trunk/qpid/cpp/src/tests/install_env.sh.in
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/install_env.sh.in?rev=1306007&r1=1306006&r2=1306007&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/install_env.sh.in (original)
+++ qpid/trunk/qpid/cpp/src/tests/install_env.sh.in Tue Mar 27 20:32:18 2012
@@ -23,4 +23,4 @@ prefix=`absdir @prefix@`
export QPID_INSTALL_PREFIX=$prefix
export PATH=$prefix/bin:$prefix/sbin:$prefix/libexec/qpid/tests:$PATH
export LD_LIBRARY_PATH=$prefix/lib:$LD_LIBRARY_PATH
-export PYTHONPATH=$prefix/lib/python2.4/site-packages:$PYTHONPATH
+export PYTHONPATH=$prefix/lib/python2.6/site-packages:$PYTHONPATH
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
