From 57a3484065040d4a651187d21482ccdd4a8faac4 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Sat, 2 Sep 2006 23:06:16 +0000
Subject: EncapPackages:  * Delete VERSION and ChangeLog, just use bcfg2
 version or svn release #  * Update install scripts to allow forcing
 replacement of local config files  * Make python build fail if "from httplib
 import HTTPS" fails  * Some doc updates

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2172 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/makeself-dist/makedist.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'encap/src/makeself-dist')

diff --git a/encap/src/makeself-dist/makedist.sh b/encap/src/makeself-dist/makedist.sh
index 72855dc4f..68aee6c99 100755
--- a/encap/src/makeself-dist/makedist.sh
+++ b/encap/src/makeself-dist/makedist.sh
@@ -234,6 +234,18 @@ chgrp 0 \${LOC_OST_CFG}*
 chmod 600 \${LOC_BCFG2_CONF}*
 chmod 600 \${LOC_OST_CFG}*
 
+# Restart services if they exist to catch any config file changes
+if [ -x /command/svc -a -x /command/svstat ]; then
+    for LOC_SERVICE in bcfg2-client bcfg2-server ostiary; do
+        if [ -h /service/\${LOC_SERVICE} ]; then
+            printf "Restarting daemontools service \${LOC_SERVICE}...\n" 
+            /command/svc -t /service/\${LOC_SERVICE}
+            sleep 2
+            /command/svstat /service/\${LOC_SERVICE}
+        fi
+    done
+fi
+    
 exit 0
 
 EOF
@@ -241,7 +253,7 @@ EOF
 chmod 755 $DISTDIR/setup.sh
 
 # Create .run file from $DISTDIR with makeself
-BLURB="Bcfg2 Client install for $SITENAME (version $SITEVER)"
+BLURB="Bcfg2 Client install for $SITENAME (version $SITEVER) - export REPLACE_CONFIG=yes before running to force config file replacement"
 ${MAKESELF} --nox11 $DISTDIR ${DISTDIR}.run "$BLURB" ./setup.sh
 
 exit 0
-- 
cgit v1.2.3-1-g7c22