>From f995c3a89d66be95959f45dda55d39309f663ac5 Mon Sep 17 00:00:00 2001 From: Karel Klic <kklic@redhat.com> Date: Tue, 6 Apr 2010 14:52:25 +0200 Subject: [PATCH 18/18] Added manpages for configuration files --- ignore.conf.5 | 1 + install_logwatch.sh | 28 ++++++++++++++++++++-------- logwatch.conf.5 | 37 +++++++++++++++++++++++++++++++++++++ override.conf.5 | 1 + 4 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 ignore.conf.5 mode change 100644 => 100755 install_logwatch.sh create mode 100644 logwatch.conf.5 create mode 100644 override.conf.5 diff --git a/ignore.conf.5 b/ignore.conf.5 new file mode 100644 index 0000000..f434964 --- /dev/null +++ b/ignore.conf.5 @@ -0,0 +1 @@ +.so man5/logwatch.conf.5 \ No newline at end of file diff --git a/install_logwatch.sh b/install_logwatch.sh old mode 100644 new mode 100755 index 6e4f7c1..3a34ce5 --- a/install_logwatch.sh +++ b/install_logwatch.sh @@ -130,7 +130,7 @@ else fi printf "Enter the path for the Logwatch ConfigDir [$CONFIGDIR] : " -read config +read config if [ "$config" = "" ]; then printf "### Using $CONFIGDIR\n" @@ -263,22 +263,25 @@ for f in `echo $PATH | tr : ' '`; do done #Man page -if [ -d $MANDIR/man8 ] && [ $HAVE_MAKEWHATIS ]; then +if [ -d $MANDIR/man5 ] && [ -d $MANDIR/man8 ] && [ $HAVE_MAKEWHATIS ]; then install -m 0644 logwatch.8 $MANDIR/man8 + install -m 0644 logwatch.conf.5 $MANDIR/man5 + install -m 0644 override.conf.5 $MANDIR/man5 + install -m 0644 ignore.conf.5 $MANDIR/man5 #OpenBSD no -s if [ $OS = "OpenBSD" ]; then - makewhatis -u $MANDIR/man8 + makewhatis -u $MANDIR/man5 $MANDIR/man8 else #FreeBSD and NetBSD no -s no -u if [ $OS = "FreeBSD" ] || [ $OS = "NetBSD" ]; then - makewhatis $MANDIR/man8 + makewhatis $MANDIR/man5 $MANDIR/man8 else #MacOS X aka Darwin no -u [even thought the manpage says] if [ $OS = "Darwin" ]; then - makewhatis -s 8 $MANDIR + makewhatis -s "5 8" $MANDIR else #Linux - makewhatis -u -s 8 $MANDIR + makewhatis -u -s "5 8" $MANDIR fi fi fi @@ -287,11 +290,20 @@ else #Go for the safe install rather then editing man.cf install -m 0644 logwatch.8 $MANDIR/man1m + install -m 0644 logwatch.conf.5 $MANDIR/man1m + install -m 0644 override.conf.5 $MANDIR/man1m + install -m 0644 ignore.conf.5 $MANDIR/man1m - catman -w -M /usr/share/man/man1m + catman -w -M $MANDIR/man1m else + install -m 0755 -d $MANDIR/man5 + install -m 0644 logwatch.conf.5 $MANDIR/man5 + install -m 0644 override.conf.5 $MANDIR/man5 + install -m 0644 ignore.conf.5 $MANDIR/man5 + install -m 0755 -d $MANDIR/man8 install -m 0644 logwatch.8 $MANDIR/man8 - printf "Installed manpage in $MANDIR/man8.\n" - printf "Check your man.cf or man.conf to enable MANSECTS 8\n" + + printf "Installed manpages in $MANDIR/man5 and $MANDIR/man8.\n" + printf "Check your man.cf or man.conf to enable MANSECTS 5 and 8\n" fi fi diff --git a/logwatch.conf.5 b/logwatch.conf.5 new file mode 100644 index 0000000..691c533 --- /dev/null +++ b/logwatch.conf.5 @@ -0,0 +1,37 @@ +.\" Written by Ivana Varekova <varekova@redhat.com>. +.TH LOGWATCH.CONF 5 2010-02-10 "GNU" "Linux Programmer's Manual" +.SH NAME +logwatch.conf, ignore.conf, override.conf - logwatch configuration files +.SH DESCRIPTION + +.BR logwatch.conf +- ( +.BR /etc/logwatch/conf/logwatch.conf +) +- can contain the local configuration options. +The list of valid settings and their default values are in +.BR /usr/share/logwatch/default.conf/logwatch.conf. + +.BR ignore.conf +- ( +.BR /etc/logwatch/conf/ignore.conf +) +is the list of regular expressions. +The set of logs decribed by this set is ignored by logwatch. + +.BR override.conf +- ( +.BR /etc/logwatch/conf/override.conf +) +contains the settings which overrides the standard configuration +of specific log files or services. The syntax is the same as in +log/service files. + +.SH FILES +.I /etc/logwatch/conf/logwatch.conf +.I /etc/logwatch/conf/logwatch.conf +.I /etc/logwatch/conf/logwatch.conf +.I /usr/share/logwatch/default.conf/logwatch.conf + +.SH "SEE ALSO" +.BR logwatch (8) diff --git a/override.conf.5 b/override.conf.5 new file mode 100644 index 0000000..775458f --- /dev/null +++ b/override.conf.5 @@ -0,0 +1 @@ +.so man5/logwatch.conf.5 -- 1.6.6.1