QPID-3603: Substitute installation directories in qpidd init scripts.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1306007 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 33 insertions, 18 deletions

diff --git a/qpid/cpp/etc/Makefile.am b/qpid/cpp/etc/Makefile.am
index 183c600f96..22e9d2778c 100644
--- a/qpid/cpp/etc/Makefile.am
+++ b/qpid/cpp/etc/Makefile.am
@@ -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
diff --git a/qpid/cpp/etc/cluster.conf-example.xml b/qpid/cpp/etc/cluster.conf-example.xml.in
index 81dc19845f..dbeb3af537 100644
--- a/qpid/cpp/etc/cluster.conf-example.xml
+++ b/qpid/cpp/etc/cluster.conf-example.xml.in
@@ -32,11 +32,11 @@ This example assumes a 3 node cluster, with nodes named node1, node2 and node3.
     </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, with nodes named node1, node2 and node3.
   <fencedevices/>
   <fence_daemon clean_start="0" post_fail_delay="0" post_join_delay="3"/>
 </cluster>
-
diff --git a/qpid/cpp/etc/qpidd-primary b/qpid/cpp/etc/qpidd-primary.in
index 2bbc22129d..39700bead3 100755
--- a/qpid/cpp/etc/qpidd-primary
+++ b/qpid/cpp/etc/qpidd-primary.in
@@ -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
diff --git a/qpid/cpp/etc/qpidd b/qpid/cpp/etc/qpidd.in
index 07cbb825d5..23c15283dc 100755
--- a/qpid/cpp/etc/qpidd
+++ b/qpid/cpp/etc/qpidd.in
@@ -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
 }
diff --git a/qpid/cpp/src/tests/install_env.sh.in b/qpid/cpp/src/tests/install_env.sh.in
index 2231954cb8..d29a23930d 100644
--- a/qpid/cpp/src/tests/install_env.sh.in
+++ b/qpid/cpp/src/tests/install_env.sh.in
@@ -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