Skip to content

Commit

Permalink
contrib: fixed up sample configuration files a bit
Browse files Browse the repository at this point in the history
Fixed up some of the biggest problems in the sample configuration files under
contrib, like program_override() with a colon, which is not needed, etc.

Also, removed deprecated log_prefix() options.
  • Loading branch information
bazsi committed Jan 9, 2011
1 parent 1a4f898 commit 0229da0
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion contrib/cygwin-packaging/syslog-ng-config
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ source applications {
};
source kernel {
file("/dev/kmsg", program_override("kernel: "));
file("/dev/kmsg", program_override("kernel"));
};
destination messages {
Expand Down
2 changes: 1 addition & 1 deletion contrib/fedora-packaging/syslog-ng.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ options {
};

source s_sys {
file ("/proc/kmsg" log_prefix("kernel: "));
file ("/proc/kmsg" program_override("kernel"));
unix-stream ("/dev/log");
internal();
# udp(ip(0.0.0.0) port(514));
Expand Down
2 changes: 1 addition & 1 deletion contrib/rhel-packaging/syslog-ng.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ log { source(s_internal); destination(d_syslognglog); };
#
#source s_local {
# unix-dgram("/dev/log");
# file("/proc/kmsg" log_prefix("kernel:"));
# file("/proc/kmsg" program_override("kernel"));
#};
#
# Local filters
Expand Down
6 changes: 3 additions & 3 deletions contrib/syslog-ng.conf.RedHat
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
# 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.
# - 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
# - use the program_override option as per Balazs Scheidler's email
#

options { sync (0);
Expand All @@ -36,7 +36,7 @@ options { sync (0);
# libc and syslog clients generally automatically detect the socket type,
# so you are free to decide which of unix-stream or unix-dgram you want to use.
#
source s_sys { file ("/proc/kmsg" log_prefix("kernel: ")); unix-stream ("/dev/log"); internal(); };
source s_sys { file ("/proc/kmsg" program_override("kernel")); unix-stream ("/dev/log"); internal(); };

destination d_cons { file("/dev/console"); };
destination d_mesg { file("/var/log/messages"); };
Expand Down
4 changes: 2 additions & 2 deletions contrib/syslog-ng.conf.doc
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ options
# source src
# {
# internal();
# file("/proc/kmsg" log_prefix("kernel: "));
# file("/proc/kmsg" program_override("kernel"));
# tcp(ip(127.0.0.1) port(4800) keep-alive(yes));
# udp();
# unix-stream("/dev/log");
Expand All @@ -304,7 +304,7 @@ source s_internal
{ internal(); };

source s_kernel
{ file("/proc/kmsg" log_prefix("kernel: ")); };
{ file("/proc/kmsg" program_override("kernel")); };

source s_tcp
{ tcp(port(4800) keep-alive(yes) max_connections(100)); };
Expand Down
2 changes: 1 addition & 1 deletion debian/syslog-ng.conf
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ source s_all {
# function to send logs to)
unix-stream("/dev/log");
# messages from the kernel
file("/proc/kmsg" log_prefix("kernel: "));
file("/proc/kmsg" program_override("kernel"));
# use the following line if you want to receive remote UDP logging messages
# (this is equivalent to the "-r" syslogd flag)
# udp();
Expand Down

0 comments on commit 0229da0

Please sign in to comment.