added syslog.conf from Debian as a sample (from bug #67267)

5 files changed, 160 insertions, 96 deletions

diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog
index ca7f5cddffcf..c2499ecddc29 100644
--- a/app-admin/syslog-ng/ChangeLog
+++ b/app-admin/syslog-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/syslog-ng
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.74 2004/12/02 04:34:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.75 2004/12/02 06:33:35 mr_bones_ Exp $
+
+  01 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/syslog-ng.conf.sample, syslog-ng-1.6.5-r1.ebuild:
+  added syslog.conf from Debian as a sample (from bug #67267)
 
   01 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
   -syslog-ng-1.6.2.ebuild, -syslog-ng-1.6.4.ebuild:
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index dbcc8bfa4772..44adcff61328 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,8 +1,8 @@
-MD5 99a87c76dbf5e6f4f4b4e2c4ed865e59 ChangeLog 11177
+MD5 1674964b30df0d1bb562a831bc6e0981 ChangeLog 11354
+MD5 c99708e3630ff4fea73915f8bb235fc8 syslog-ng-1.6.5-r1.ebuild 1661
 MD5 06a2fa1e0308f065f818db6fae959fe9 metadata.xml 257
-MD5 b6290319eb91d778b3c002e991a89df3 syslog-ng-1.6.5-r1.ebuild 1620
+MD5 5b474be9a74bb0c72edecc60ed7f0309 files/syslog-ng.conf.debian 5444
 MD5 ec03b691f321f282bc875862b147922c files/syslog-ng.conf.gentoo 1068
-MD5 f0f2cd6e0951bc82d74c7f92c4e3b417 files/syslog-ng.conf.sample 3735
 MD5 fe66a527c7f36a560197b4187ad6d9db files/syslog-ng.logrotate 342
 MD5 df8c4758a11ded9f1bfed606f821168b files/syslog-ng.rc6 1519
 MD5 ed7691a108eb1acf100c3a7c540de262 files/digest-syslog-ng-1.6.5-r1 67
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.debian b/app-admin/syslog-ng/files/syslog-ng.conf.debian
new file mode 100644
index 000000000000..03a66d814fba
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.debian
@@ -0,0 +1,149 @@
+#
+# Syslog-ng configuration file, compatible with default Debian syslogd
+# installation. Originally written by anonymous (I can't find his name)
+# Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>)
+
+# First, set some global options.
+options { long_hostnames(off); sync(0); use_dns(no);
+	  owner("root"); group("adm"); perm(0640);
+};
+
+########################
+# Sources
+########################
+# This is the default behavior of sysklogd package
+# Logs may come from unix stream, but not from another machine.
+#
+source src { unix-dgram("/dev/log"); internal();
+       	     file("/proc/kmsg" log_prefix("kernel: "));
+};
+
+# If you wish to get logs from remote machine you should uncomment
+# this and comment the above source line.
+#
+#source net { tcp(ip(127.0.0.1) port(1000) authentication(required) encrypt(allow)); };
+
+########################
+# Destinations
+########################
+# First some standard logfile
+#
+destination auth { file("/var/log/auth.log"); };
+destination cron { file("/var/log/cron.log"); };
+destination daemon { file("/var/log/daemon.log"); };
+destination kern { file("/var/log/kern.log"); };
+destination lpr { file("/var/log/lpr.log"); };
+destination mail { file("/var/log/mail.log"); };
+destination syslog { file("/var/log/syslog.log"); };
+destination user { file("/var/log/user.log"); };
+destination uucp { file("/var/log/uucp.log"); };
+
+# This files are the log come from the mail subsystem.
+#
+destination mailinfo { file("/var/log/mail/mail.info"); };
+destination mailwarn { file("/var/log/mail/mail.warn"); };
+destination mailerr { file("/var/log/mail/mail.err"); };
+
+# Logging for INN news system
+#
+destination newscrit { file("/var/log/news/news.crit"); };
+destination newserr { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+# Some `catch-all' logfiles.
+#
+destination debug { file("/var/log/debug"); };
+destination error { file("/var/log/error"); };
+
+# The root's console.
+#
+destination console { usertty("root"); };
+
+# Virtual console.
+#
+destination console_all { file("/dev/vc/10"); };
+
+# The named pipe /dev/xconsole is for the nsole' utility.  To use it,
+# you must invoke nsole' with the -file' option:
+#
+#    $ xconsole -file /dev/xconsole [...]
+#
+destination xconsole { pipe("/dev/xconsole"); };
+
+# Send the messages to an other host
+#
+#destination net { tcp("127.0.0.1" port(1000) authentication(on) encrypt(on) log_fifo_size(1000)); };
+
+# Debian only
+destination ppp { file("/var/log/ppp.log"); };
+
+########################
+# Filters
+########################
+# Here's come the filter options. With this rules, we can set which 
+# message go where.
+
+filter dbg { level(debug); };
+filter info { level(info); };
+filter notice { level(notice); };
+filter warn { level(warn); };
+filter err { level(err); };
+filter crit { level(crit .. emerg); };
+
+filter debug { level(debug) and not facility(auth, authpriv, news, mail); };
+filter error { level(err .. emerg) ; };
+
+filter auth { facility(auth, authpriv) and not filter(debug); };
+filter cron { facility(cron) and not filter(debug); };
+filter daemon { facility(daemon) and not filter(debug); };
+filter kern { facility(kern) and not filter(debug); };
+filter lpr { facility(lpr) and not filter(debug); };
+filter local { facility(local0, local1, local3, local4, local5,
+                        local6, local7) and not filter(debug); };
+filter mail { facility(mail) and not filter(debug); };
+filter news { facility(news) and not filter(debug); };
+filter syslog { facility(syslog) and not filter(debug); };
+filter user { facility(user) and not filter(debug); };
+filter uucp { facility(uucp) and not filter(debug); };
+
+filter cnews { level(notice, err, crit) and facility(news); };
+filter cother { level(debug, info, notice, warn) or facility(daemon, mail); };
+
+filter ppp { facility(local2) and not filter(debug); };
+filter console { level(warn .. emerg); };
+
+########################
+# Log paths
+########################
+log { source(src); filter(auth); destination(auth); };
+log { source(src); filter(cron); destination(cron); };
+log { source(src); filter(daemon); destination(daemon); };
+log { source(src); filter(kern); destination(kern); };
+log { source(src); filter(lpr); destination(lpr); };
+log { source(src); filter(syslog); destination(syslog); };
+log { source(src); filter(user); destination(user); };
+log { source(src); filter(uucp); destination(uucp); };
+
+log { source(src); filter(mail); destination(mail); };
+#log { source(src); filter(mail); filter(info); destination(mailinfo); };
+#log { source(src); filter(mail); filter(warn); destination(mailwarn); };
+#log { source(src); filter(mail); filter(err); destination(mailerr); };
+
+log { source(src); filter(news); filter(crit); destination(newscrit); };
+log { source(src); filter(news); filter(err); destination(newserr); };
+log { source(src); filter(news); filter(notice); destination(newsnotice); };
+#log { source(src); filter(cnews); destination(console_all); };
+#log { source(src); filter(cother); destination(console_all); };
+
+#log { source(src); filter(ppp); destination(ppp); };
+
+log { source(src); filter(debug); destination(debug); };
+log { source(src); filter(error); destination(error); };
+
+log { source(src); filter(console); destination(console_all);
+				    destination(xconsole); };
+log { source(src); filter(crit); destination(console); };
+
+# All messages send to a remote site
+#
+#log { source(src); destination(net); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.sample b/app-admin/syslog-ng/files/syslog-ng.conf.sample
deleted file mode 100644
index a6bc19f049e5..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.sample
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Syslog-ng example configuration for for Debian GNU/Linux
-#
-# Copyright (c) 1999 anonymous
-# Copyright (c) 1999 Balazs Scheidler
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.conf.sample,v 1.5 2004/07/18 02:25:02 dragonheart Exp $
-#
-# Syslog-ng configuration file, compatible with default Debian syslogd
-# installation. 
-#
-
-options { long_hostnames(off); sync(0); };
-
-source src { unix-stream("/dev/log"); internal(); };
-source kernsrc { pipe("/proc/kmsg"); };
-#source net { udp(); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(cron); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) 
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
-
diff --git a/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild
index c1e9c72abade..3801f2e7f360 100644
--- a/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild,v 1.8 2004/11/30 06:21:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.5-r1.ebuild,v 1.9 2004/12/02 06:33:35 mr_bones_ Exp $
 
 inherit flag-o-matic
 
@@ -22,7 +22,7 @@ PROVIDE="virtual/logger"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/doc/sgml
+	cd "${S}/doc/sgml"
 	tar xzf syslog-ng.html.tar.gz
 }
 
@@ -42,7 +42,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog INSTALL NEWS PORTS README \
 		doc/{syslog-ng.conf.sample,syslog-ng.conf.demo,stresstest.sh} \
 		doc/sgml/{syslog-ng.dvi,syslog-ng.ps,syslog-ng.sgml,syslog-ng.txt} \
-		contrib/syslog2ng
+		contrib/syslog2ng "${FILESDIR}/syslog-ng.conf.debian"
 	dohtml doc/sgml/syslog-ng.html/*
 
 	# Install default configuration