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

Package-Manager: portage-2.1.2_rc4-r2

4 files changed, 101 insertions, 55 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/Manifest b/app-admin/metalog/Manifest
index c8883e9387d9..d5a5aee6dfa0 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -9,10 +9,10 @@ AUX metalog-0.8_rc1-gcc41.patch 1034 RMD160 f41a07e5f42374a42122498ae8ab41023946
 MD5 68806326e368e39b5bbb7927a9467646 files/metalog-0.8_rc1-gcc41.patch 1034
 RMD160 f41a07e5f42374a42122498ae8ab41023946c2a9 files/metalog-0.8_rc1-gcc41.patch 1034
 SHA256 d2419dfc7b8bd98abc526dac62dc5332e6e6cd5d4c60e843669a03705fdd0eee files/metalog-0.8_rc1-gcc41.patch 1034
-AUX metalog.conf 1769 RMD160 5960bbb17b01946f9e1089cfc29f90c2cbf12a00 SHA1 8cf0ac824fb5ae6b099d01040689f3b9a38a71ef SHA256 79148ddfe35e540ccf6bdeac8a033fdc3793629ccfdafe6786a413d54bcf9c9d
-MD5 f745c6700ef26d32a0aa76904d3b1aa3 files/metalog.conf 1769
-RMD160 5960bbb17b01946f9e1089cfc29f90c2cbf12a00 files/metalog.conf 1769
-SHA256 79148ddfe35e540ccf6bdeac8a033fdc3793629ccfdafe6786a413d54bcf9c9d files/metalog.conf 1769
+AUX metalog.conf 2829 RMD160 d31aca0017a8d3e139edf110bf60ac61c819195d SHA1 ad8046b25c6acbcfc989e83c65531cafffdadc26 SHA256 826cf070200c67c55cfad631c94214ef9ce5b87a3586f58c9ac3aea9e55238b6
+MD5 8b4edb8635ecfcca7560b3e10cfbbd5b files/metalog.conf 2829
+RMD160 d31aca0017a8d3e139edf110bf60ac61c819195d files/metalog.conf 2829
+SHA256 826cf070200c67c55cfad631c94214ef9ce5b87a3586f58c9ac3aea9e55238b6 files/metalog.conf 2829
 AUX metalog.confd 505 RMD160 f575216debd3b6a0461f17a9c23657426b8b97e5 SHA1 84031ea9a673aa87edbc0088a51d86809007a69c SHA256 ec9f05b386a06a4b2d5398cc0c33f34eba3f5e74ad46ae203d682f8ebc593f99
 MD5 ec30e8aa71d3b8fa92e0d6d1ca908797 files/metalog.confd 505
 RMD160 f575216debd3b6a0461f17a9c23657426b8b97e5 files/metalog.confd 505
@@ -22,14 +22,14 @@ MD5 a5a14468481c04c51ef1287f074d280e files/metalog.initd 742
 RMD160 70fc469c31e95adfad00188782b287a00cca37a0 files/metalog.initd 742
 SHA256 070d18e3e0aa9bf9ae7d7546dad8b8783e2bfbecb73e259bbb352ef925f3bd9a files/metalog.initd 742
 DIST metalog-0.8-rc1.tar.gz 121744 RMD160 29747402e79fdbe73a1880c792d62af534d407a4 SHA1 0c704ec61ebb799a1826116207d2ac5945d50192 SHA256 45a77348b834482ecfd5e0455c4444009cf26bc319e2a4c409e9ea1df890ab51
-EBUILD metalog-0.8_rc1-r2.ebuild 1565 RMD160 fcd8b519ec96aec614c0a9e2d7dd22cc3315629a SHA1 c71a1fda58b7fcbbf17c2a4fb07d9f9a780aa688 SHA256 07153bce38f97b2889e472451e10a0b798f8bf760e940d095e697f83ef16c303
-MD5 5a2ced001df7b5e673fd47a08f0dc3ce metalog-0.8_rc1-r2.ebuild 1565
-RMD160 fcd8b519ec96aec614c0a9e2d7dd22cc3315629a metalog-0.8_rc1-r2.ebuild 1565
-SHA256 07153bce38f97b2889e472451e10a0b798f8bf760e940d095e697f83ef16c303 metalog-0.8_rc1-r2.ebuild 1565
-MISC ChangeLog 7029 RMD160 1dc5a6c67dce88fd1d6e16b98e65567557c5cb52 SHA1 d3baa53ae20803d1a4ba178234ea17f03b183dff SHA256 cb4150cd64884ec62c7358742c80e9b4c44abc61c1cba5c3073cc00af7093fbe
-MD5 6e5d12a98a5b6101285e98a7bfcd6027 ChangeLog 7029
-RMD160 1dc5a6c67dce88fd1d6e16b98e65567557c5cb52 ChangeLog 7029
-SHA256 cb4150cd64884ec62c7358742c80e9b4c44abc61c1cba5c3073cc00af7093fbe ChangeLog 7029
+EBUILD metalog-0.8_rc1-r2.ebuild 1615 RMD160 e6314ffde18c254e4037e57acfdcabc344cee7a8 SHA1 c0359ad8dcc2910ac55c2a563874c68a641ada83 SHA256 5f00a0373fdce2bf00e2cf789f6b696ad64338d73301740d9c7ba403e8db85ed
+MD5 62a2ff5ded7f465919fc1cec55c0a22e metalog-0.8_rc1-r2.ebuild 1615
+RMD160 e6314ffde18c254e4037e57acfdcabc344cee7a8 metalog-0.8_rc1-r2.ebuild 1615
+SHA256 5f00a0373fdce2bf00e2cf789f6b696ad64338d73301740d9c7ba403e8db85ed metalog-0.8_rc1-r2.ebuild 1615
+MISC ChangeLog 7028 RMD160 e9e2f8dcde4413cdf54a4cc238cbbef875011b95 SHA1 6e11f7195330d99c0e7bf56d24a9631a8554f4c2 SHA256 ae68a639f972bafb41346544c1b57d38384a6b42ae648ce3ba33c6911fcea9e9
+MD5 9e1a98395170de02c3cb8d542382f8ac ChangeLog 7028
+RMD160 e9e2f8dcde4413cdf54a4cc238cbbef875011b95 ChangeLog 7028
+SHA256 ae68a639f972bafb41346544c1b57d38384a6b42ae648ce3ba33c6911fcea9e9 ChangeLog 7028
 MISC metadata.xml 314 RMD160 b5cfae82ba7a016a10d13d0b62b0d66e50fb6b01 SHA1 7f6322c1fc2a5a6e4a35cf14b2703ff5dd2e7cfe SHA256 78aebc8429da49e61f8be390a479e595376714b34c9f707bcd8a032e17f0f28f
 MD5 6c2b69b044ec7524da59b7415ff50e86 metadata.xml 314
 RMD160 b5cfae82ba7a016a10d13d0b62b0d66e50fb6b01 metadata.xml 314
@@ -40,7 +40,7 @@ SHA256 d5f647650b62ed5ba7b0e39489a0c29b1e3080517de57b6f22b9ff03f07a74cb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFleY08bi6rjpTunYRAqzCAJ9q1k9jfIzHmBfrBYEzqXAh7ahk1wCfYKdD
-T3uzgGGxISBFX52yPhYq48Y=
-=AhSE
+iD8DBQFFlfFI8bi6rjpTunYRAu/KAJ9Las4V7hfCcglKhZc0PhCvprd0iQCeK1+x
+sEqnNJhXEXY+5RYFSs3qTcs=
+=BTNY
 -----END PGP SIGNATURE-----
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() {