EncapPackages: Move from daemontools to runit to avoid any issues with redistributing patched daemontool binaries.

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2856 ce84e21b-d406-0410-9b95-82705330c041

4 files changed, 30 insertions, 30 deletions

diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl
index f54cb1e18..998a34b4a 100644
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl
+++ b/encap/src/bcfg2-site/bcfg2-site-RENAME/encapinfo.tmpl
@@ -5,7 +5,7 @@ date ${DATE}
 contact "${ADMIN_NAME}" <${ADMIN_EMAIL}>
 description bcfg2-site-${SITE_SHORTNAME} - bcfg2 configuration for ${SITE_NAME}
 prereq pkgspec >= bcfg2-0.8.2
-prereq pkgspec >= daemontools-0.76
 prereq pkgspec >= ostiary-3.4
+prereq pkgspec >= runit-1.7.2
 exclude etc
 exclude sbin
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl
index ebc39b61d..2c98e910f 100644
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl
+++ b/encap/src/bcfg2-site/bcfg2-site-RENAME/etc/ostiary.cfg.tmpl
@@ -1,20 +1,20 @@
 #include "site-settings.conf"
 # If present, ostiaryd will shut down once the cache of bad IPs is full.
-# Under daemontools, this just has the effect of generating a service
-# restart log message.
+# Under runit, this just has the effect of generating a service restart
+# log message.
 EXIT_ON_IPCACHE_FULL
 
 # If present, ostiaryd will not detach from the terminal it was started
 # from. This is useful when running ostiaryd from programs like inetd or
-# cygrunsrv or daemontools.
+# cygrunsrv or runit.
 SKIP_DETACH
 
 # Port to listen on. (Can be specified on command line.)
 PORT=${OSTIARY_PORT}
 
 # The password to remotely kill ostiaryd. Sort of useless when running under
-# daemontools, since daemontools will just start ostiaryd back up. (But it
-# is required to be in this file)
+# runit, since runit will just start ostiaryd back up. (But it is required
+# to be in this file)
 KILL="${OSTIARY_PASSWORD}-kill"
 
 # Must be at least one action.  Format is:
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl
index 1ac29eb7e..c8ed2d694 100755
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl
+++ b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl
@@ -124,31 +124,31 @@ else
     touch ${BASEDIR}/sbin/.SENTINEL_SITE
 fi
 
-# ostiary (daemontools)
-if [ ! -h /service/ostiary ]; then
-    if [ -d /usr/local/var/svc.d/ostiary ]; then
-        printf "INFO: Enabling ostiary service (via daemontools)...\n"
-        ln -s /usr/local/var/svc.d/ostiary /service/ostiary
+# ostiary (runit)
+if [ ! -h /usr/local/var/service/ostiary ]; then
+    if [ -d /usr/local/etc/sv/ostiary ]; then
+        printf "INFO: Enabling ostiary service (via runit)...\n"
+        ln -s /usr/local/etc/sv/ostiary /usr/local/var/service/ostiary
     else
-        printf "ERROR: /usr/local/var/svc.d/ostiary does not exist.\n"
+        printf "ERROR: /usr/local/etc/sv/ostiary does not exist.\n"
         exit 1
     fi
 else
-    printf "INFO: /service/ostiary already exists, not replacing...\n"
+    printf "INFO: /usr/local/var/service/ostiary already exists, not replacing...\n"
 fi
 
-# bcfg2-client (daemontools)
+# bcfg2-client (runit)
 //if int(@BCFG2_CLIENT_RUN_INTERVAL_SECONDS) > 0
-if [ ! -h /service/bcfg2-client ]; then
-    if [ -d /usr/local/var/svc.d/bcfg2-client ]; then
-        printf "INFO: Enabling bcfg2-client service (via daemontools)...\n"
-        ln -s /usr/local/var/svc.d/bcfg2-client /service/bcfg2-client
+if [ ! -h /usr/local/var/service/bcfg2-client ]; then
+    if [ -d /usr/local/etc/sv/bcfg2-client ]; then
+        printf "INFO: Enabling bcfg2-client service (via runit)...\n"
+        ln -s /usr/local/etc/sv/bcfg2-client /usr/local/var/service/bcfg2-client
     else
-        printf "ERROR: /usr/local/var/svc.d/bcfg2-client does not exist.\n"
+        printf "ERROR: /usr/local/etc/sv/bcfg2-client does not exist.\n"
         printf "ERROR: Could not enable bcfg2-client service.\n"
     fi
 else
-    printf "INFO: /service/bcfg2-client already exists, not replacing...\n"
+    printf "INFO: /usr/local/var/service/bcfg2-client already exists, not replacing...\n"
 fi
 //end if
 
diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh
index 55b20caac..a446e27f0 100755
--- a/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh
+++ b/encap/src/bcfg2-site/bcfg2-site-RENAME/sbin/ost-bcfg2.sh
@@ -8,19 +8,19 @@
 umask 002
 exec 2>&1
 
-LOG="multilog t /usr/local/var/multilog/bcfg2-client-ostiary"
-PATH=/usr/local/lib/bcfg2/bin:/command:/usr/local/bin:/usr/bin:/bin
+LOG="svlogd -tt /usr/local/var/svlogd/bcfg2-client-ostiary"
+PATH=/usr/local/lib/bcfg2/bin:/usr/local/bin:/usr/bin:/bin
 export PATH
 
 case $1 in
-       dvqn) bcfg2 -d -v -q -n      | $LOG ;;
-        dvn) bcfg2 -d -v -n         | $LOG ;;
-        dvq) bcfg2 -d -v -q         | $LOG ;;
-         dv) bcfg2 -d -v            | $LOG ;;
-         vq) bcfg2 -v -q            | $LOG ;;
-          v) bcfg2 -v               | $LOG ;; 
-    restart) svc -t bcfg2-client    | $LOG ;; 
-          *) printf "ERROR in $0\n" | $LOG ;; 
+       dvqn) bcfg2 -d -v -q -n       | $LOG ;;
+        dvn) bcfg2 -d -v -n          | $LOG ;;
+        dvq) bcfg2 -d -v -q          | $LOG ;;
+         dv) bcfg2 -d -v             | $LOG ;;
+         vq) bcfg2 -v -q             | $LOG ;;
+          v) bcfg2 -v                | $LOG ;; 
+    restart) sv restart bcfg2-client | $LOG ;; 
+          *) printf "ERROR in $0\n"  | $LOG ;; 
 esac
 
 exit 0
\ No newline at end of file