commit a85a2e051b2f940db125a03ae6dbaa6f65a2e309
parent e5514bfdf051bc406ea0b7c34e993567163e4c12
Author: Gerrit Pape <pape@smarden.org>
Date: Fri, 25 Apr 2003 07:24:06 +0000
runscripts.
documentation.
Diffstat:
6 files changed, 74 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
@@ -2,8 +2,9 @@ runit (0.9.0-1) unstable; urgency=low
* new upstream version.
* debian/rules: minor cleanup.
+ * debian/control: Standards-Version: 3.5.9.
- -- Gerrit Pape <pape@smarden.org> Thu, 24 Apr 2003 15:58:34 +0200
+ -- Gerrit Pape <pape@smarden.org> Fri, 25 Apr 2003 09:22:27 +0200
runit (0.8.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Gerrit Pape <pape@smarden.org>
Build-Depends: dietlibc-dev (>> 0.22-0), debhelper (>> 3.0.0)
-Standards-Version: 3.5.8
+Standards-Version: 3.5.9
Package: runit
Architecture: any
diff --git a/doc/benefits.html b/doc/benefits.html
@@ -104,8 +104,10 @@ supervises an additional log service, redirects the log daemon's standard
input to read from the pipe, and redirects the service daemon's standard
output to write to the pipe.
Restarting the service does not require restarting the log service.
-A good choice for a log daemon is
-<a href="http://cr.yp.to/daemontools/multilog.html">multilog</a>.
+A good choice for a log daemon is <i>runit</i>'s service logging daemon
+<a href="svlogd.8.html">svlogd</a>, or
+<a href="http://cr.yp.to/daemontools/multilog.html">multilog</a> from the
+<i>daemontools</i> package.
<p>
The service daemon and the log daemon can run with different process states,
and under different user ids.
diff --git a/doc/index.html b/doc/index.html
@@ -116,29 +116,29 @@ no 1, here is an example:
# strings /proc/1/exe |grep Id
$Id: runit.c,v 1.7 2002/02/13 09:59:52 pape Exp $
# uptime
- 14:36:29 up 88 days, 1:51, 2 users, load average: 0.20, 0.13, 0.04
+ 08:53:39 up 178 days, 19:11, 1 user, load average: 0.24, 0.12, 0.04
# ps axuw |head -n20
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
- root 1 0.0 0.0 20 16 ? S 2002 0:05 runit
+ root 1 0.0 0.0 20 16 ? S 2002 0:06 runit
root 2 0.0 0.0 0 0 ? SW 2002 0:00 [keventd]
root 3 0.0 0.0 0 0 ? SWN 2002 0:00 [ksoftirqd_CPU0]
- root 4 0.0 0.0 0 0 ? SW 2002 0:16 [kswapd]
- root 5 0.0 0.0 0 0 ? SW 2002 0:00 [bdflush]
- root 6 0.0 0.0 0 0 ? SW 2002 0:01 [kupdated]
- root 168 0.0 0.2 1652 584 ? S 2002 0:00 /usr/sbin/cron
- root 174 0.0 0.0 36 24 ? S 2002 0:00 runsvdir /service log: ........................................................................................................
+ root 4 0.0 0.0 0 0 ? SW 2002 1:29 [kswapd]
+ root 5 0.0 0.0 0 0 ? SW 2002 0:02 [bdflush]
+ root 6 0.0 0.0 0 0 ? SW 2002 0:10 [kupdated]
+ root 168 0.0 0.0 1652 216 ? S 2002 0:00 /usr/sbin/cron
+ root 174 0.0 0.0 36 24 ? S 2002 0:00 runsvdir /var/service log: ....................................................................................................
root 176 0.0 0.0 20 20 ? S 2002 0:00 runsv qmail-send
root 177 0.0 0.0 20 20 ? S 2002 0:00 runsv getty-5
root 178 0.0 0.0 20 20 ? S 2002 0:00 runsv getty-4
root 179 0.0 0.0 20 20 ? S 2002 0:00 runsv getty-3
root 180 0.0 0.0 20 20 ? S 2002 0:00 runsv getty-2
- root 181 0.0 0.0 20 20 ? S 2002 0:00 runsv qmail-smtpd
root 182 0.0 0.0 20 20 ? S 2002 0:00 runsv socklog-unix
- root 183 0.0 0.1 1256 384 tty5 S 2002 0:00 getty 38400 tty5 linux
- root 184 0.0 0.1 1256 384 tty3 S 2002 0:00 getty 38400 tty3 linux
+ root 183 0.0 0.0 1256 40 tty5 S 2002 0:00 getty 38400 tty5 linux
+ root 184 0.0 0.0 1256 40 tty3 S 2002 0:00 getty 38400 tty3 linux
root 185 0.0 0.0 20 20 ? S 2002 0:00 runsv socklog-klog
root 186 0.0 0.0 20 20 ? S 2002 0:00 runsv ssh
-# pstree
+ root 187 0.0 0.0 1256 40 tty4 S 2002 0:00 getty 38400 tty4 linux
+ # pstree
runit-+-bdflush
|-cron
|-keventd
@@ -150,25 +150,24 @@ no 1, here is an example:
| |-qmail-lspawn
| `-qmail-rspawn
|-4*[runsv---getty]
- |-runsv-+-multilog
- | `-tcpserver---qmail-smtpd
|-2*[runsv-+-multilog]
| `-socklog]
|-runsv-+-multilog
- | `-sshd-+-2*[sshd---sshd---tail]
- | |-sshd---sshd---bash
+ | `-sshd-+-sshd---sshd
| `-sshd---sshd---bash---bash---pstree
|-runsv---clockspeed
|-runsv-+-dnscache
| `-multilog
- |-runsv---apache-ssl-+-20*[apache-ssl]
+ |-runsv---apache-ssl-+-12*[apache-ssl]
| |-gcache
| `-4*[multilog]
|-6*[runsv-+-multilog]
| `-tcpserver]
|-3*[runsv-+-multilog]
| `-tinydns]
- `-runsv---uncat
+ |-runsv---uncat
+ `-2*[runsv-+-multilog]
+ `-tcpsvd]
</pre>
This is from a more busy system:
<pre>
@@ -195,7 +194,7 @@ smoothly escaping from <i>sysvinit</i>.
<hr>
If <i>runit</i> on linux is compiled and linked with
<a href="http://www.fefe.de/dietlibc/">dietlibc</a> it yields in a statically
-linked <tt>runit</tt> binary of 9.7k size and this <tt>ps axuw</tt> output
+linked <tt>runit</tt> binary of 8.5k size and this <tt>ps axuw</tt> output
on my system:
<pre>
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
diff --git a/doc/runscripts.html b/doc/runscripts.html
@@ -12,14 +12,15 @@
<hr>
This is a collection of <tt>run</tt> scripts for popular services to have
them monitored by the
-<a href="http://cr.yp.to/daemontools.html">daemontools</a> package.
+<a href="http://cr.yp.to/daemontools.html">daemontools</a> or
+<a href="http://smarden.org/runit/">runit</a> package.
If you have additional run scripts or one of these run scripts works for you on
an operating system not stated here, please
<a href="mailto:pape-runscripts@smarden.org">let me know</a>.
<p>
Thanks go to the following people for contributing run scripts:
Alessandro Bono, Robin S. Socha, Claus Alboege, Paul Jarc, clemens fischer,
-Jesse Cablek, Lukas Beeler, Thomas Baden, Ralf Hildebrandt.
+Jesse Cablek, Lukas Beeler, Thomas Baden, Ralf Hildebrandt, Antonio Dias.
<hr>
<a href="#apache">apache</a><br>
<a href="#apache2">apache2</a><br>
@@ -32,6 +33,7 @@ Jesse Cablek, Lukas Beeler, Thomas Baden, Ralf Hildebrandt.
<a href="#dhcpcd">dhcpcd</a><br>
<a href="#dhcpd">dhcpd</a><br>
<a href="#expireproctitle">expireproctitle</a><br>
+<a href="#fam">fam</a><br>
<a href="#gdm">gdm</a><br>
<a href="#getty">getty</a><br>
<a href="#identd">identd</a><br>
@@ -47,6 +49,7 @@ logging console messages</a><br>
<a href="#ppp">ppp</a><br>
<a href="#proftpd">proftpd</a><br>
<a href="#pure-ftpd">pure-ftpd</a><br>
+<a href="#radiusd">radiusd</a><br>
<a href="#rsyncd">rsyncd</a><br>
<a href="#samba">samba (smbd, nmbd)</a><br>
<a href="#squid">squid</a><br>
@@ -56,6 +59,7 @@ logging console messages</a><br>
<a href="#stunnel">stunnel</a><br>
<a href="#taiclockd">taiclockd</a><br>
<a href="#tomcat">tomcat</a><br>
+<a href="#wvdial">wvdial</a><br>
<a href="#xdm">xdm</a><br>
<hr>
@@ -201,6 +205,17 @@ to be set up.
exec sleep 300
</pre>
<hr>
+<h3><a name="fam">A <tt>fam</tt> run script</a></h3>
+(<i>Slackware Linux 9.0</i>)
+<pre>
+ #!/bin/sh
+ exec 2>&1
+ exec /usr/bin/fam -L -f -v
+</pre>
+This service needs a
+<a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a>
+to be set up.
+<hr>
<h3><a name="gdm">A <tt>gdm</tt> run script</a></h3>
<i>(Debian woody)</i>
<pre>
@@ -217,6 +232,13 @@ to be set up.
The <a href="index.html">runit</a> package does not care about utmp records
for getties. You should choose a getty that handles its own utmp and wtmp
records. Debian's <tt>mingetty</tt> does create his own utmp record.
+<p>
+<h3>An <tt>agetty</tt> run script</h3>
+(<i>Slackware Linux 9.0</i>)
+<pre>
+ #!/bin/sh
+ exec /sbin/agetty 38400 tty1 linux
+</pre>
<hr>
<h3><a name="identd">An <tt>oidentd</tt> run script</a></h3>
(<i>Linux</i>, oidentd version 2.0.4, needs patch to add the -n flag)
@@ -330,6 +352,17 @@ to be set up.
exec /usr/sbin/pure-ftpd -a 50 -E -l pam -u 100
</pre>
<hr>
+<h3><a name="radiusd">A <tt>radiusd</tt> run script</a></h3>
+(<i>Slackware Linux 9.0</i>, cistron radius 1.6.1)
+<pre>
+ #!/bin/sh
+ exec 2>&1
+ exec radiusd -f -y -z -lstdout
+</pre>
+This service needs a
+<a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a>
+to be set up.
+<hr>
<h3><a name="rsyncd">A <tt>rsyncd</tt> run script</a></h3>
(<i>SunOS</i>)
<pre>
@@ -456,6 +489,18 @@ to be set up.
/pack/tomcat/current/bin/catalina.sh run
</pre>
<hr>
+<h3><a name="wvdial">A <tt>wvdial</tt> run script</a></h3>
+(<i>Slackware Linux 9.0</i>, the service should have a <tt>down</tt>
+file, use <tt>svc -o /service/wvdial</tt> to bring up a ppp connection)
+<pre>
+ #!/bin/sh
+ exec 2>&1
+ exec wvdial ISP
+</pre>
+This service needs a
+<a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a>
+to be set up.
+<hr>
<h3><a name="xdm">A <tt>xdm</tt> run script</a></h3>
(<i>Linux</i>)
<pre>
diff --git a/package/CHANGES b/package/CHANGES
@@ -1,5 +1,5 @@
runit 0.9.0
-Thu, 24 Apr 2003 15:08:26 +0200
+Fri, 25 Apr 2003 09:22:03 +0200
* runsvdir.c: don't propagate sig_term to runsv processes when receiving
sig_term; send sig_term to all runsv processes and exit 111 when
receiving sig_hangup.
@@ -10,6 +10,8 @@ Thu, 24 Apr 2003 15:08:26 +0200
it's not in state 'want down'.
* svwaitup.c: minor code cleanup.
* man/runsvdir.8, man/svwaitdown.8: adapt.
+ * doc/runscripts.html: add contributed run scripts (thx!).
+ * doc/upgrade.html, doc/index.html: adapt.
runit 0.8.4
Sun, 20 Apr 2003 19:31:24 +0200
