Samba now has supervise/multilog support

6 files changed, 67 insertions, 19 deletions

diff --git a/net-fs/samba/files/nmbd-log b/net-fs/samba/files/nmbd-log
new file mode 100755
index 000000000000..a9c37656f035
--- /dev/null
+++ b/net-fs/samba/files/nmbd-log
@@ -0,0 +1,3 @@
+#!/bin/bash
+test -p logfifo || mknod logfifo p
+exec multilog t ./nmbd-log < logfifo
diff --git a/net-fs/samba/files/nmbd-run b/net-fs/samba/files/nmbd-run
new file mode 100755
index 000000000000..860e2ce7eb47
--- /dev/null
+++ b/net-fs/samba/files/nmbd-run
@@ -0,0 +1,9 @@
+#!/bin/sh
+mypid=`pidof /usr/sbin/nmbd`
+if [ -z "$mypid" ]
+then
+	/usr/sbin/nmbd -l ./log/logfifo
+	sleep 2
+	mypid=`pidof /usr/sbin/nmbd`
+fi
+exec /usr/bin/watchpid $mypid
diff --git a/net-fs/samba/files/samba b/net-fs/samba/files/samba
index 32088e3bfdcd..7d0775dfeabd 100755
--- a/net-fs/samba/files/samba
+++ b/net-fs/samba/files/samba
@@ -1,34 +1,47 @@
 #!/bin/sh
-#RCUPDATE:2 3 4:75:This line is required for script management
+#RCUPDATE:3 4:76:This line is required for script management
 
 . /etc/rc.d/config/functions
 
-SERVICE0=nmbd
-SERVICE1=smbd
+SERVICE=samba
 opts="start stop restart"
 
 EXE0=/usr/sbin/nmbd
 EXE1=/usr/sbin/smbd
 
 start() {
-		ebegin "Starting $SERVICE0..."
-     		start-stop-daemon --start --quiet --exec $EXE0 
-		eend $? "Started $SERVICE0." "Error Starting $SERVICE0."
-		ebegin "Starting $SERVICE1..."
-     		start-stop-daemon --start --quiet --exec $EXE1 
-		eend $? "Started $SERVICE1." "Error Starting $SERVICE1."
+		ebegin "Starting $SERVICE"
+		start-stop-daemon --start --quiet --exec $EXE0 
+		result=$?
+		start-stop-daemon --start --quiet --exec $EXE1 
+		result=$(( $result + $? ))
+		eend $result "Started $SERVICE." "Error starting $SERVICE."
 
 }
 
 stop() {
-		ebegin "Stopping $SERVICE0..."
-		start-stop-daemon --stop --quiet --exec $EXE0
-		eend $? "Stopped $SERVICE0." "Error Stopping $SERVICE0."
-		ebegin "Stopping $SERVICE1..."
-		start-stop-daemon --stop --quiet --exec $EXE1
-		eend $? "Stopped $SERVICE1." "Error Stopping $SERVICE1."
+		ebegin "Starting $SERVICE"
+		start-stop-daemon --stop --quiet --exec $EXE0 
+		result=$?
+		start-stop-daemon --stop --quiet --exec $EXE1 
+		result=$(( $result + $? ))
+		eend $result "Stopped $SERVICE." "Error stopping $SERVICE."
 
 }
+supervise_start() {
+		ebegin "Starting supervised $SERVICE"
+		svc -u /etc/supervise/smbd
+		svc -u /etc/supervise/nmbd
+		eend $? "Started $SERVICE." "Error starting $SERVICE."
+}
+
+
+supervise_stop() {
+		ebegin "Stopping supervised $SERVICE"
+		svc -d /etc/supervise/smbd
+		svc -d /etc/supervise/nmbd
+		eend $? "Stopped $SERVICE." "Error stopping $SERVICE."
+}
 
 restart () {
 	stop
diff --git a/net-fs/samba/files/smbd-log b/net-fs/samba/files/smbd-log
new file mode 100755
index 000000000000..b9cc0dddbde7
--- /dev/null
+++ b/net-fs/samba/files/smbd-log
@@ -0,0 +1,3 @@
+#!/bin/bash
+test -p logfifo || mknod logfifo p
+exec multilog t ./smbd-log < logfifo
diff --git a/net-fs/samba/files/smbd-run b/net-fs/samba/files/smbd-run
new file mode 100755
index 000000000000..fbd9e4704f6e
--- /dev/null
+++ b/net-fs/samba/files/smbd-run
@@ -0,0 +1,9 @@
+#!/bin/sh
+mypid=`pidof /usr/sbin/smbd`
+if [ -z "$mypid" ]
+then
+	/usr/sbin/smbd -l ./log/logfifo
+	sleep 2
+	mypid=`pidof /usr/sbin/smbd`
+fi
+exec /usr/bin/watchpid $mypid
diff --git a/net-fs/samba/samba-2.0.7-r1.ebuild b/net-fs/samba/samba-2.0.7-r2.ebuild
index d98bb7c0a098..9c8b33db1af7 100644
--- a/net-fs/samba/samba-2.0.7-r1.ebuild
+++ b/net-fs/samba/samba-2.0.7-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.7-r1.ebuild,v 1.8 2000/12/28 15:31:10 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-2.0.7-r2.ebuild,v 1.1 2001/01/01 23:26:29 drobbins Exp $
 
 P=samba-2.0.7
 A=${P}.tar.gz
@@ -21,9 +21,7 @@ src_compile() {
   cd ${S}/source
   CFLAGS="$CFLAGS -I/usr/include/openssl" try ./configure --prefix=/usr \
 	--sysconfdir=/etc/smb --localstatedir=/var/log --libdir=/etc/smb --sbindir=/usr/sbin \
-	--with-automount \
-	--with-utmp --without-sambabook --with-netatalk \
-	--with-smbmount --with-pam --with-syslog \
+	--with-automount --with-utmp --without-sambabook --with-netatalk --with-smbmount --with-pam \
 	--with-privatedir=/etc/smb/private --with-lockdir=/var/lock --with-swatdir=/usr/share/swat
   try make
 }
@@ -68,6 +66,19 @@ src_install() {
 	cp ${O}/files/samba ${D}/etc/rc.d/init.d
 	diropts -m0700
 	dodir /etc/smb/private
+
+	#supervise support
+	local x
+	for x in smbd nmbd
+	do
+		dodir /var/supervise/${x}/log
+		chmod +t ${D}/var/supervise/${x}
+		exeinto /var/supervise/${x}
+		newexe ${FILESDIR}/${x}-run run
+		exeinto /var/supervise/${x}/log
+		newexe ${FILESDIR}/${x}-log run
+		dosym /var/supervise/${x}/log/${x}-log /var/log/${x}.d
+	done
 }
 
 pkg_config() {