contrib subdirectory and its contents copied from syslog-ng 1.6.x

ChangeLog

@@ -2,6 +2,63 @@
 # arch-tag: [email protected]/syslog-ng--mainline--2.0
 #
 
+2005-09-26 09:16:38 GMT	Balazs Scheidler <[email protected]>	patch-55
+
+    Summary:
+      contrib subdirectory and its contents copied from syslog-ng 1.6.x
+    Revision:
+      syslog-ng--mainline--2.0--patch-55
+
+
+
+
+    new files:
+     contrib/.arch-ids/=id contrib/.arch-ids/Makefile.am.id
+     contrib/.arch-ids/README.id contrib/.arch-ids/init.d.HP-UX.id
+     contrib/.arch-ids/init.d.RedHat-7.3.id
+     contrib/.arch-ids/init.d.RedHat.id
+     contrib/.arch-ids/init.d.SuSE.id
+     contrib/.arch-ids/init.d.SunOS.id
+     contrib/.arch-ids/init.d.solaris.id
+     contrib/.arch-ids/relogger.pl.id
+     contrib/.arch-ids/syslog-ng.conf.HP-UX.id
+     contrib/.arch-ids/syslog-ng.conf.RedHat.id
+     contrib/.arch-ids/syslog-ng.conf.SunOS.id
+     contrib/.arch-ids/syslog-ng.conf.doc.id
+     contrib/.arch-ids/syslog-ng.vim.id
+     contrib/.arch-ids/syslog2ng.id contrib/Makefile.am
+     contrib/README contrib/fedora-packaging/.arch-ids/=id
+     contrib/fedora-packaging/.arch-ids/syslog-ng.conf.id
+     contrib/fedora-packaging/.arch-ids/syslog-ng.init.id
+     contrib/fedora-packaging/.arch-ids/syslog-ng.logrotate.id
+     contrib/fedora-packaging/.arch-ids/syslog-ng.sysconfig.id
+     contrib/fedora-packaging/syslog-ng.conf
+     contrib/fedora-packaging/syslog-ng.init
+     contrib/fedora-packaging/syslog-ng.logrotate
+     contrib/fedora-packaging/syslog-ng.sysconfig
+     contrib/init.d.HP-UX contrib/init.d.RedHat
+     contrib/init.d.RedHat-7.3 contrib/init.d.SuSE
+     contrib/init.d.SunOS contrib/init.d.solaris
+     contrib/relogger.pl contrib/rhel-packaging/.arch-ids/=id
+     contrib/rhel-packaging/.arch-ids/syslog-ng.conf.id
+     contrib/rhel-packaging/.arch-ids/syslog-ng.init.id
+     contrib/rhel-packaging/.arch-ids/syslog-ng.logrotate.id
+     contrib/rhel-packaging/syslog-ng.conf
+     contrib/rhel-packaging/syslog-ng.init
+     contrib/rhel-packaging/syslog-ng.logrotate
+     contrib/syslog-ng.conf.HP-UX contrib/syslog-ng.conf.RedHat
+     contrib/syslog-ng.conf.SunOS contrib/syslog-ng.conf.doc
+     contrib/syslog-ng.vim contrib/syslog2ng
+
+    modified files:
+     ChangeLog Makefile.am configure.in
+
+    new directories:
+     contrib contrib/.arch-ids contrib/fedora-packaging
+     contrib/fedora-packaging/.arch-ids contrib/rhel-packaging
+     contrib/rhel-packaging/.arch-ids
+
+
 2005-08-30 07:35:56 GMT	Balazs Scheidler <[email protected]>	patch-54
 
     Summary:

Makefile.am

@@ -1 +1 @@
-SUBDIRS = src doc tests
+SUBDIRS = src tests doc contrib

configure.in

@@ -187,6 +187,7 @@ AC_OUTPUT(dist.conf
 	  src/Makefile 
 	  doc/Makefile
           doc/docvars.xml
+	  contrib/Makefile
 	  tests/Makefile 
           tests/unit/Makefile
           tests/functional/Makefile)

contrib/Makefile.am

@@ -0,0 +1,14 @@
+
+EXTRA_DIST = README init.d.solaris init.d.HP-UX init.d.RedHat init.d.SuSE 	\
+	init.d.SunOS init.d.solaris syslog-ng.conf.HP-UX syslog-ng.conf.RedHat	\
+	syslog-ng.conf.SunOS syslog2ng syslog-ng.vim init.d.RedHat-7.3		\
+	syslog-ng.conf.doc relogger.pl \
+	fedora-packaging/syslog-ng.conf	\
+	fedora-packaging/syslog-ng.init	\
+	fedora-packaging/syslog-ng.sysconfig	\
+	fedora-packaging/syslog-ng.logrotate    \
+	rhel-packaging/syslog-ng.conf  \
+	rhel-packaging/syslog-ng.init  \
+	rhel-packaging/syslog-ng.logrotate
+
+

contrib/README

@@ -0,0 +1,19 @@
+This directory contains unsorted user contributions of syslog-ng. They are
+not maintained, nor supported, but may be useful to some.
+
+NOTE: these were simply copied from syslog-ng 1.6 distribution, therefore
+might not work out-of-the-box for syslog-ng 2.0.
+
+
+init.d.HP-UX 		- sample init script for HP-UX
+init.d.RedHat 		- sample init script for RedHat GNU/Linux
+init.d.SunOS 		- sample init script for Sun Solaris
+init.d.solaris 		- another sample init script for Sun Solaris
+syslog-ng.conf.HP-UX 	- sample configuration for HP-UX
+syslog-ng.conf.RedHat 	- sample configuration for RedHat GNU/Linux
+syslog-ng.conf.SunOS 	- sample configuration for SunOS
+syslog-ng.conf.doc	- sample configuration file with inline documentation as comments
+syslog-ng.vim 		- vim syntax file for syslog-ng.conf
+syslog2ng		- script to convert old syslog.conf to syslog-ng.conf
+relogger.pl		- script to replay syslog messages at the original rate
+fedora-packaging	- directory containing files related to Fedora packaging

contrib/fedora-packaging/syslog-ng.conf

@@ -0,0 +1,77 @@
+# syslog-ng configuration file.
+#
+# This should behave pretty much like the original syslog on RedHat. But
+# it could be configured a lot smarter.
+#
+# See syslog-ng(8) and syslog-ng.conf(5) for more information.
+#
+# 20000925 [email protected]
+#
+# Updated by Frank Crawford (<[email protected]>) - 10 Aug 2002
+# 	- for Red Hat 7.3
+#	- totally do away with klogd
+#	- add message "kernel:" as is done with klogd.
+#
+# Updated by Frank Crawford (<[email protected]>) - 22 Aug 2002
+#	- use the log_prefix option as per Balazs Scheidler's email
+#
+# Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 05 Apr 2003
+#	- corrected filters 'f_filter2' and 'f_filter6'
+#     these filters were only allowing messages of one specific
+#     priority level; they should be allowing messages from that
+#     priority and upper levels.
+#
+# Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 25 Jan 2005
+#   - Don't sync the d_mail destination
+#
+# Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 01 Feb 2005
+#   - /proc/kmsg is a file not a pipe.
+#     (https://lists.balabit.hu/pipermail/syslog-ng/2005-February/006963.html)
+#
+
+options {
+    sync (0);
+    time_reopen (10);
+    log_fifo_size (1000);
+    long_hostnames (off);
+    use_dns (no);
+    use_fqdn (no);
+    create_dirs (no);
+    keep_hostname (yes);
+};
+
+source s_sys {
+    file ("/proc/kmsg" log_prefix("kernel: "));
+    unix-stream ("/dev/log");
+    internal();
+    # udp(ip(0.0.0.0) port(514));
+};
+
+destination d_cons { file("/dev/console"); };
+destination d_mesg { file("/var/log/messages"); };
+destination d_auth { file("/var/log/secure"); };
+destination d_mail { file("/var/log/maillog" sync(10)); };
+destination d_spol { file("/var/log/spooler"); };
+destination d_boot { file("/var/log/boot.log"); };
+destination d_cron { file("/var/log/cron"); };
+destination d_mlal { usertty("*"); };
+
+#filter f_filter1   { facility(kern); };
+filter f_filter2   { level(info..emerg) and
+                     not facility(mail,authpriv,cron); };
+filter f_filter3   { facility(authpriv); };
+filter f_filter4   { facility(mail); };
+filter f_filter5   { level(emerg); };
+filter f_filter6   { facility(uucp) or
+                     (facility(news) and level(crit..emerg)); };
+filter f_filter7   { facility(local7); };
+filter f_filter8   { facility(cron); };
+
+#log { source(s_sys); filter(f_filter1); destination(d_cons); };
+log { source(s_sys); filter(f_filter2); destination(d_mesg); };
+log { source(s_sys); filter(f_filter3); destination(d_auth); };
+log { source(s_sys); filter(f_filter4); destination(d_mail); };
+log { source(s_sys); filter(f_filter5); destination(d_mlal); };
+log { source(s_sys); filter(f_filter6); destination(d_spol); };
+log { source(s_sys); filter(f_filter7); destination(d_boot); };
+log { source(s_sys); filter(f_filter8); destination(d_cron); };

contrib/fedora-packaging/syslog-ng.init

@@ -0,0 +1,88 @@
+#!/bin/sh
+#
+# syslog-ng    This starts and stops syslog-ng
+#
+# chkconfig:   2345 12 88
+# description: reads and logs messages to the system console, log \
+#              files, other machines and/or users as specified by \
+#              its configuration file.
+# processname: /sbin/syslog-ng
+# config:      /etc/syslog-ng/syslog-ng.conf
+# config:      /etc/sysconfig/syslog-ng
+# pidfile:     /var/run/syslog-ng.pid
+#
+### BEGIN INIT INFO
+# Provides: $syslog
+### END INIT INFO
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+exec="/sbin/syslog-ng"
+prog=$(basename $exec)
+
+[ -f $exec ] || exit 0
+
+# Source config
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+umask 077
+
+start() {
+    echo -n $"Starting $prog: "
+    daemon $exec $SYSLOGNG_OPTIONS
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
+}
+
+stop() {
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    echo -n $"Reloading syslog-ng.conf file: "
+    killproc $prog -HUP
+    retval=$?
+    echo
+    return $retval
+}
+
+force_reload() {
+    restart
+}
+
+fdr_status() {
+    status $prog
+}
+
+case "$1" in
+    start|stop|restart|reload)
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        fdr_status
+        ;;
+    condrestart|try-restart)
+        [ ! -f $lockfile ] || restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        exit 2
+esac

contrib/fedora-packaging/syslog-ng.logrotate

@@ -0,0 +1,6 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
+    sharedscripts
+    postrotate
+	/bin/kill -HUP `cat /var/run/syslog-ng.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}

contrib/fedora-packaging/syslog-ng.sysconfig

@@ -0,0 +1,5 @@
+#---
+# Syslog-ng command line options
+# See syslog-ng(8) for more details
+#---
+SYSLOGNG_OPTIONS=""