Skip to content

Commit 0229da0

Browse files
committed
contrib: fixed up sample configuration files a bit
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.
1 parent 1a4f898 commit 0229da0

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

contrib/cygwin-packaging/syslog-ng-config

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ source applications {
220220
};
221221
222222
source kernel {
223-
file("/dev/kmsg", program_override("kernel: "));
223+
file("/dev/kmsg", program_override("kernel"));
224224
};
225225
226226
destination messages {

contrib/fedora-packaging/syslog-ng.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ options {
4141
};
4242

4343
source s_sys {
44-
file ("/proc/kmsg" log_prefix("kernel: "));
44+
file ("/proc/kmsg" program_override("kernel"));
4545
unix-stream ("/dev/log");
4646
internal();
4747
# udp(ip(0.0.0.0) port(514));

contrib/rhel-packaging/syslog-ng.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log { source(s_internal); destination(d_syslognglog); };
1414
#
1515
#source s_local {
1616
# unix-dgram("/dev/log");
17-
# file("/proc/kmsg" log_prefix("kernel:"));
17+
# file("/proc/kmsg" program_override("kernel"));
1818
#};
1919
#
2020
# Local filters

contrib/syslog-ng.conf.RedHat

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
# Updated by Frank Crawford (<Frank.Crawford@ac3.com.au>) - 10 Aug 2002
1111
# - for Red Hat 7.3
1212
# - totally do away with klogd
13-
# - add message "kernel:" as is done with klogd.
13+
# - add message "kernel" as is done with klogd.
1414
#
1515
# Updated by Frank Crawford (<Frank.Crawford@ac3.com.au>) - 22 Aug 2002
16-
# - use the log_prefix option as per Balazs Scheidler's email
16+
# - use the program_override option as per Balazs Scheidler's email
1717
#
1818

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

4141
destination d_cons { file("/dev/console"); };
4242
destination d_mesg { file("/var/log/messages"); };

contrib/syslog-ng.conf.doc

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ options
283283
# source src
284284
# {
285285
# internal();
286-
# file("/proc/kmsg" log_prefix("kernel: "));
286+
# file("/proc/kmsg" program_override("kernel"));
287287
# tcp(ip(127.0.0.1) port(4800) keep-alive(yes));
288288
# udp();
289289
# unix-stream("/dev/log");
@@ -304,7 +304,7 @@ source s_internal
304304
{ internal(); };
305305

306306
source s_kernel
307-
{ file("/proc/kmsg" log_prefix("kernel: ")); };
307+
{ file("/proc/kmsg" program_override("kernel")); };
308308

309309
source s_tcp
310310
{ tcp(port(4800) keep-alive(yes) max_connections(100)); };

debian/syslog-ng.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ source s_all {
7777
# function to send logs to)
7878
unix-stream("/dev/log");
7979
# messages from the kernel
80-
file("/proc/kmsg" log_prefix("kernel: "));
80+
file("/proc/kmsg" program_override("kernel"));
8181
# use the following line if you want to receive remote UDP logging messages
8282
# (this is equivalent to the "-r" syslogd flag)
8383
# udp();

0 commit comments

Comments
 (0)