Pull updates from upstream metalog.conf and improve our own sections #132794.

(Portage version: 2.1.2_rc4-r2)

3 files changed, 86 insertions, 40 deletions

diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog
index 71d500b36625..3feba89f662c 100644
--- a/app-admin/metalog/ChangeLog
+++ b/app-admin/metalog/ChangeLog
@@ -1,10 +1,9 @@
 # ChangeLog for app-admin/metalog
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.53 2006/12/30 04:07:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.54 2006/12/30 04:54:33 vapier Exp $
 
-  30 Dec 2006; Mike Frysinger <vapier@gentoo.org> files/consolelog.sh,
-  files/metalog.conf, metalog-0.8_rc1-r2.ebuild:
-  Move consolelog.sh to /sbin.
+  30 Dec 2006; Mike Frysinger <vapier@gentoo.org> files/metalog.conf:
+  Pull updates from upstream metalog.conf and improve our own sections #132794.
 
   22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   metalog-0.8_rc1-r2.ebuild:
diff --git a/app-admin/metalog/files/metalog.conf b/app-admin/metalog/files/metalog.conf
index ce30692eab33..04532784a0f8 100644
--- a/app-admin/metalog/files/metalog.conf
+++ b/app-admin/metalog/files/metalog.conf
@@ -1,25 +1,43 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.conf,v 1.7 2006/12/30 04:07:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/files/metalog.conf,v 1.8 2006/12/30 04:54:33 vapier Exp $
 #
 # Sample Metalog configuration file 
 
-maxsize  = 100000   # bytes
-maxtime  = 86400    # seconds (86400 = 1 day)
+maxsize  = 1048576  # size in bytes
+maxtime  = 86400    # time in seconds (86400 = 1 day)
 maxfiles = 5        # num files per dir
 
-Kernel messages :
+# This will capture all of the internal log messages that metalog itself
+# generates.  If you use any "command" options below, you will want this
+# as metalog generates a lot of status messages whenever it executes a
+# command and children processes exit.
+#Metalog :
+#
+#  program  = "metalog"
+#  logidr   = "/var/log/metalog"
+#  break    = 1
 
-  facility = "kern"
-  logdir   = "/var/log/kernel"
+# Uncomment and adjust the following lines according to your console logging
+# needs.  If you want to only output things that were not caught by other log
+# sections, move this to the end of the file.
+#
+# Hint: you can change the log console in /etc/conf.d/metalog
+#
+#console logging :
+#
+#  facility = "*"
+#  command  = "/sbin/consolelog.sh"
 
-Crond :
+Everything important :
 
-  facility = "cron"
-  logdir   = "/var/log/crond"
+  facility = "*"
+  minimum  = 6
+  logdir   = "/var/log/everything"
 
-Dudes firewalled by IPTrap :
+Everything very important :
 
-  program  = "iptrap"
-  logdir   = "/var/log/iptrap"
+  facility = "*"
+  minimum  = 1
+  logdir   = "/var/log/critical"
 
 Password failures :
 
@@ -29,63 +47,92 @@ Password failures :
   logdir   = "/var/log/pwdfail"
 #  command  = "/usr/local/sbin/mail_pwd_failures.sh"  
 
+Kernel messages :
+
+  facility = "kern"
+  logdir   = "/var/log/kernel"
+  break    = 1
+
+Crond :
+
+  facility = "cron"
+  logdir   = "/var/log/crond"
+  break    = 1
+
 FTP Server :
 
-  program  = "pure-ftpd"
+  facility = "ftp"
   logdir   = "/var/log/ftpd"
+  break    = 1
+
+News Server :
+
+  facility = "news"
+  logdir   = "/var/log/news"
+  break    = 1
+
+Dudes firewalled by IPTrap :
+
+  program  = "iptrap"
+  logdir   = "/var/log/iptrap"
+  break    = 1
 
 SSH Server :
 
   program  = "sshd"
   logdir   = "/var/log/sshd"
+  break    = 1
 
 Telnet :
 
   program  = "login"
   logdir   = "/var/log/telnet"
+  break    = 1
 
 Imap :
 
   program  = "/usr/sbin/imapd"
   logdir   = "/var/log/imap"
+  break    = 1
 
 POP Toaster :
 
   program  = "/usr/sbin/ipop3d"
   logdir   = "/var/log/pop"
+  break    = 1
 
 #Add authenticated IP addresses for SMTP relaying :
 
 #  program  = "/usr/sbin/ipop3d"
 #  regex    = "Login.+nmsgs="
 #  command  = "/usr/local/sbin/add_pop_address.sh"
+#  break    = 1
 
 Mail :
 
   facility = "mail"
+  neg_regex= "starting daemon"
   logdir   = "/var/log/mail"
+  break    = 1
 
-Everything important :
+Exim :
 
-  facility = "*"
-  minimum  = 6
-  logdir   = "/var/log/everything"
+  program_regex = "^exim"
+  logdir   = "/var/log/exim"
+  break    = 1
 
-Everything very important :
+Ppp :
+  program_regex = "^ppp"
+  logdir   = "/var/log/ppp"
+  break    = 1
 
-  facility = "*"
-  minimum  = 1
-  logdir   = "/var/log/critical"
+Postgresql :
+  program_regex = "^postmaster"
+  program_regex = "^postgres"
+  logdir   = "/var/log/postgres"
+  break    = 1
 
-#
-#Uncomment and adjust the following lines to 
-#your needs to enable console logging
-#
-# Hint: you can change the device to which
-#       should be logged in /etc/conf.d/metalog
-#
-
-#console logging :
-#
-#  facility = "*"
-#  command = "/sbin/consolelog.sh"
+Apache :
+  program_regex = "^httpd"
+  logdir   = "/var/log/http"
+  break    = 1
diff --git a/app-admin/metalog/metalog-0.8_rc1-r2.ebuild b/app-admin/metalog/metalog-0.8_rc1-r2.ebuild
index b221984041d8..49ec9e333600 100644
--- a/app-admin/metalog/metalog-0.8_rc1-r2.ebuild
+++ b/app-admin/metalog/metalog-0.8_rc1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.8_rc1-r2.ebuild,v 1.14 2006/12/30 04:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.8_rc1-r2.ebuild,v 1.15 2006/12/30 04:54:33 vapier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -41,8 +41,8 @@ src_install() {
 	newinitd "${FILESDIR}"/metalog.initd metalog
 	newconfd "${FILESDIR}"/metalog.confd metalog
 
-	exeinto /sbin
-	doexe "${FILESDIR}"/consolelog.sh || die
+	exeinto /usr/sbin
+	dobin "${FILESDIR}"/consolelog.sh || die
 }
 
 pkg_preinst() {