summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--doc/install.html12
-rw-r--r--doc/replaceinit.html4
-rw-r--r--doc/runscripts.html62
-rw-r--r--package/CHANGES7
-rwxr-xr-xpackage/upgrade4
-rw-r--r--package/versions1
7 files changed, 54 insertions, 38 deletions
diff --git a/Makefile b/Makefile
index b39929c..4573116 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DESTDIR=
 
-PACKAGE=runit-1.2.2
+PACKAGE=runit-1.2.3
 DIRS=doc man etc package src
 MANPAGES=runit.8 runit-init.8 runsvdir.8 runsv.8 svwaitdown.8 svwaitup.8 \
 utmpset.8 runsvchdir.8 runsvstat.8 runsvctrl.8 svlogd.8 chpst.8
diff --git a/doc/install.html b/doc/install.html
index 4e2449f..afa63a8 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -17,14 +17,14 @@ If you don't have a <tt>/package</tt> directory, create it now:
   # chmod 1755 /package
 </pre>
 Download
-<a href="runit-1.2.2.tar.gz">runit-1.2.2.tar.gz</a> into <tt>/package</tt>
+<a href="runit-1.2.3.tar.gz">runit-1.2.3.tar.gz</a> into <tt>/package</tt>
 and unpack the archive
 <pre>
   # cd /package
-  # gunzip runit-1.2.2.tar
-  # tar -xpf runit-1.2.2.tar
-  # rm runit-1.2.2.tar
-  # cd admin/runit-1.2.2
+  # gunzip runit-1.2.3.tar
+  # tar -xpf runit-1.2.3.tar
+  # rm runit-1.2.3.tar
+  # cd admin/runit-1.2.3
 </pre>
 On MacOSX, do
 <pre>
@@ -43,7 +43,7 @@ hierarchy, do:
 </pre>
 To report success:
 <pre>
-  # mail pape-runit-1.2.2@smarden.org &lt;compile/sysdeps
+  # mail pape-runit-1.2.3@smarden.org &lt;compile/sysdeps
 </pre>
 If you use <i>runit</i> regularly, please
 <a href="http://smarden.org/pape/#contribution">contribute</a> to the project.
diff --git a/doc/replaceinit.html b/doc/replaceinit.html
index 3858413..c39c292 100644
--- a/doc/replaceinit.html
+++ b/doc/replaceinit.html
@@ -117,7 +117,7 @@ default Unix process no 1 <i>runit</i>.
 </pre>
 To report success:
 <pre>
- # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.2.2@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.2.3@smarden.org
 </pre>
 <hr>
 
@@ -206,7 +206,7 @@ This will cause <i>runit</i> to enter stage 3 which runs
 <p>
 To report success:
 <pre>
- # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.2.2@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.2.3@smarden.org
 </pre>
 <h3>Step 5: Service migration</h3>
 The goal is to migrate all services from <i>/etc/rc.*</i> scheme to the
diff --git a/doc/runscripts.html b/doc/runscripts.html
index 7cd8ec2..ef194ff 100644
--- a/doc/runscripts.html
+++ b/doc/runscripts.html
@@ -62,10 +62,12 @@ Stefan Karrmann, Kevin Berry, Karl Chen.
 <a href="#loglinuxkernel">logging Linux kernel messages</a><br>
 <a href="http://multivac.cwru.edu./fdtools/grabconsole/">
 logging console messages</a><br>
+<a href="#mdadm">mdadm</a><br>
 <a href="#minidentd">minidentd</a><br>
 <a href="#mpd">mpd</a><br>
-<a href="#mysql">mysql</a><br>
+<a href="#nscd">nscd</a><br>
 <a href="#ntpd">ntpd</a><br>
+<a href="#nullidentd">nullidentd</a><br>
 <a href="#polipo">polipo</a><br>
 <a href="#pop3-ssl">pop3-ssl</a><br>
 <a href="#pop3vscan">pop3vscan</a><br>
@@ -543,6 +545,16 @@ A run script for <tt>logging Linux kernel messages with multilog</tt></a></h3>
  multilog t n64 ./main
 </pre>
 <hr>
+<h3><a name="mdadm">A <tt>mdadm</tt> run script</a></h3>
+(<i>Debian sarge</i>)
+<pre>
+ #!/bin/sh
+ DEBIANCONFIG=/etc/default/mdadm
+ MAIL_TO=root
+ test -f $DEBIANCONFIG && . $DEBIANCONFIG
+ exec mdadm --monitor --scan --mail $MAIL_TO
+</pre>
+<hr>
 <h3><a name="minidentd">A <tt>minidentd</tt> run script</a></h3>
 (<i>Linux</i>)
 <pre>
@@ -568,34 +580,19 @@ 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="mysql">A <tt>mysql</tt> run script</a></h3>
-(<i>SunOS</i>)
-<pre>
- #!/bin/sh
- exec setuidgid mysql /pack/mysql/current/libexec/mysqld \
-         --basedir=/pack/mysql/current \
-         --datadir=/pack/mysql/data/ \
-         --socket=/tmp/mysql.sock \
-         --pid-file=/pack/mysql/data/mysql.pid 2&gt;&amp;1
-</pre>
-(<i>LFS</i>)
-<pre>
- #!/bin/sh
- exec 2&gt;&amp;1
- exec /usr/sbin/mysqld -u mysql
-</pre>
-(<i>Debian</i>, ``It's an ugly hack, but it works'')
+<h3><a name="nscd">A <tt>nscd</tt> run script</a></h3>
+(<i>Debian sarge</i>)
 <pre>
  #!/bin/sh
- cd /
- umask 077
- 
- MYSQLADMIN='/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf'
- 
- trap "$MYSQLADMIN shutdown" 0
- trap 'exit 2' 1 2 3 15
- 
- /usr/bin/mysqld_safe &amp; wait
+ secure=""
+ for table in passwd group
+   do
+     if egrep '^'$table':.*nisplus' /etc/nsswitch.conf >/dev/null
+       then
+         nscd_nischeck $table || secure="$secure -S $table,yes"
+     fi
+ done
+ exec nscd -d -- $secure
 </pre>
 <hr>
 <h3><a name="ntpd">A <tt>ntpd</tt> run script</a></h3>
@@ -607,6 +604,17 @@ to be set up.
    ntpd -n
 </pre>
 <hr>
+<h3><a name="nullidentd">A <tt>nullidentd</tt> run script</a></h3>
+(<i>Debian sarge</i>)
+<pre>
+ #!/bin/sh
+ exec 2>&1
+ exec tcpsvd -u nobody -x nullidentd-cdb -t 60 0 113 nullidentd
+</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="polipo">A <tt>polipo</tt> run script</a></h3>
 (<i>Linux</i>)
 <pre>
diff --git a/package/CHANGES b/package/CHANGES
index af71f46..0835fee 100644
--- a/package/CHANGES
+++ b/package/CHANGES
@@ -1,3 +1,10 @@
+runit 1.2.3
+
+  * doc/runscripts.html: add contributed run scripts (thx Kevin Berry);
+    remove mysql run scripts.
+  * svlogd.dist, svwaitdown.dist, svwaitup.dist: fix program selftest's
+    false alarms (thx Ian Stokes-Rees).
+
 runit 1.2.2
 Sun, 03 Apr 2005 09:21:52 +0000
   * doc/index.html, doc/replaceinit.html: no longer refer to sysvinit's
diff --git a/package/upgrade b/package/upgrade
index ef861f9..51b99aa 100755
--- a/package/upgrade
+++ b/package/upgrade
@@ -8,9 +8,9 @@ test -d src || sh -cx '! : Wrong working directory.'
 here=`env - PATH=$PATH pwd`
 parent=`dirname $here`
 
-echo 'Creating symlink runit -> runit-1.2.2...'
+echo 'Creating symlink runit -> runit-1.2.3...'
 rm -f runit
-ln -s runit-1.2.2 runit
+ln -s runit-1.2.3 runit
 mv -f runit ..
 
 echo 'Making command links in /command...'
diff --git a/package/versions b/package/versions
index cda7dc4..6163082 100644
--- a/package/versions
+++ b/package/versions
@@ -33,3 +33,4 @@
 1.2.0
 1.2.1
 1.2.2
+1.2.3