Remove mention of radwatch except to say that it should not be used.

diff --git a/doc/supervise-radiusd.txt b/doc/supervise-radiusd.txt
index 4a3f114..4d45356 100644 (file)
--- a/doc/supervise-radiusd.txt
+++ b/doc/supervise-radiusd.txt
@@ -11,8 +11,10 @@ Supervising the Radiusd Daemon
 
     This text describes how to setup both the free radius daemon so that
     it is automatically restarted upon death.  To do this, we'll use
-    either Dan Bernstein's 'daemontools' package, the inittab file or
-    radwatch tool from this distribution.
+    either Dan Bernstein's 'daemontools' package or the inittab file.
+
+    Note: The radwatch script that used to be part of this distribution,
+    is depreciated and SHOULD NOT BE USED.
 
 1.  SETTING UP DAEMONTOOLS
 
@@ -95,18 +97,14 @@ Supervising the Radiusd Daemon
     properly.  If it doesn't work, that means your radius start command
     is bad and you need to fix it.
 
-4.  SUPERVISING WITH RADWATCH
-
-    See man radwatch for details
-
-5.  ACKNOWLEDGEMENTS
+4.  ACKNOWLEDGEMENTS
  
     Document author:  Jeff Carneal
     daemontools auther:  Dan Bernstein
     Further daemontool notes (below):  Antonio Dias
     Radwatch note: Andrey Melnikov
 
-6.  FURTHER DAEMONTOOLS NOTES
+5.  FURTHER DAEMONTOOLS NOTES
 
     Here are some notes by Antonia Dias sent to the free radius mailing list.
     Some of you may find this useful after reading the above and the docs for

diff --git a/man/man8/radwatch.8 b/man/man8/radwatch.8
index 2711866..e2cd82f 100644 (file)
--- a/man/man8/radwatch.8
+++ b/man/man8/radwatch.8
@@ -10,8 +10,12 @@ waits for it to terminate, which should never happen. If it does
 happen, \fBradwatch\fP sends mail to \fIroot\fP informing her of
 the event, waits 10 seconds, then restarts the server.
 .PP
-The FreeRADIUS server should now stable enough that this wrapper
-is probably no longer needed.
+This script \fBSHOULD NOT BE USED\fP!  It's only here for historical
+purposes, and WILL be deleted in a future version of the
+the server.
+.PP
+Please see '\fIdoc/supervise-radiusd.txt\fP' for info on methods of
+supervising your radius installation.
 .SH OPTIONS
 Passed directly to the radius server - see the manpage of \fBradiusd\fP.
 .SH SEE ALSO

diff --git a/scripts/radwatch.in b/scripts/radwatch.in
index 2868567..854324b 100755 (executable)
--- a/scripts/radwatch.in
+++ b/scripts/radwatch.in
@@ -9,7 +9,7 @@
 #             the server.
 #
 #             If you want to watch and re-start the server, we recommend
-#             reading the file ../doc/supervise-radiusd.txt
+#             reading the file doc/supervise-radiusd.txt
 #
 #
 # Version:     $Id$

diff --git a/suse/freeradius.spec b/suse/freeradius.spec
index f40456f..1f0cb9c 100644 (file)
--- a/suse/freeradius.spec
+++ b/suse/freeradius.spec
@@ -106,7 +106,7 @@ make install R=$RPM_BUILD_ROOT
 ldconfig -n $RPM_BUILD_ROOT%{_libdir}
 # logs
 touch $RPM_BUILD_ROOT/var/log/radius/radius.log
-touch $RPM_BUILD_ROOT/var/log/radius/radwatch.log
+#touch $RPM_BUILD_ROOT/var/log/radius/radwatch.log
 touch $RPM_BUILD_ROOT/var/log/radius/radwtmp
 touch $RPM_BUILD_ROOT/var/log/radius/radutmp
 # SuSE
@@ -167,7 +167,7 @@ mv -v doc/README doc/README.doc
 /usr/sbin/check-radiusd-config
 /usr/sbin/checkrad
 /usr/sbin/radiusd
-/usr/sbin/radwatch
+#/usr/sbin/radwatch
 # shared libs
 /%{_libdir}/*.so*
 /%{_libdir}/*.la*
@@ -182,13 +182,15 @@ mv -v doc/README doc/README.doc
 /var/log/radius/radutmp
 %ghost /var/log/radius/radwtmp
 %ghost /var/log/radius/radius.log
-%ghost /var/log/radius/radwatch.log
+#%ghost /var/log/radius/radwatch.log
 
 %files devel
 /%{_libdir}/*.a
 
 %changelog -n freeradius
-* Wed Nov 7 2002 - nix@susesecurity.com
+* Fri Nov 8 2002 - nix@susesecurity.com
+- Removed radwatch from the spec file as it's no longer supported.
+* Thu Nov 7 2002 - nix@susesecurity.com
 - Merged some changes from stark@suse.de including if statement to
   take care of > SuSE 8.0
 * Wed Nov 6 2002 - nix@susesecurity.com