X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng.conf;h=6ac66366451ada61103e749e353388e0f6cf6e30;hb=78bc5c965406bd2b174fe2cc530aaf8caa175f8c;hp=3981ddc51a70eac88b645d80f5126258f66f4bdb;hpb=d241bcb347a73e63259af64ae7099660f346b46f;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 3981ddc..6ac6636 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,5 @@
-@version: 3.0
+@version: #VERSION#
+@include "scl.conf"
 #
 # Syslog-ng configuration for PLD Linux
 #
@@ -18,18 +19,22 @@ options {
 	time_reopen(10);
 	time_reap(360);
 	mark_freq(600);
-	log_fifo_size(2048);
+	threaded(yes);
 };
 
-source s_sys	{
-	pipe ("/proc/kmsg" program_override("kernel"));
-	unix-stream("/dev/log" max-connections(1000));
+source s_sys {
+# NOTE:
+#   if you are running under systemd and just merged config then you may
+#   need to manually fix /dev/log symlink:
+# # ln -s /run/systemd/journal/dev-log /dev/log
+	system();
 	internal();
 };
 
 # uncomment the line below if you want to setup syslog server
 #source s_net	{ udp(); };
 
+# if using systemd, an IP address instead of name may be required here
 #destination d_loghost	{ udp("loghost" port(514)); };
 
 destination d_kern	{ file("/var/log/kernel"); };
@@ -38,7 +43,7 @@ destination d_authlog	{ file("/var/log/secure"); };
 destination d_mail	{ file("/var/log/maillog"); };
 destination d_uucp	{ file("/var/log/spooler"); };
 destination d_debug	{ file("/var/log/debug"); };
-destination d_cron	{ file("/var/log/cron" owner(root) group(crontab) perm(0660)); };
+destination d_cron	{ file("/var/log/cron"); };
 destination d_syslog	{ file("/var/log/syslog"); };
 destination d_daemon	{ file("/var/log/daemon"); };
 destination d_lpr		{ file("/var/log/lpr"); };
@@ -97,7 +102,7 @@ filter p_emergency	{ level(emerg); };
 filter f_freshclam	{ program(freshclam); };
 filter f_ppp		{ program(pppd) or program(chat); };
 filter f_postgres	{ program(postgres); };
-filter f_iptables	{ match("IN=[A-Za-z0-9\.]* OUT=[A-Za-z0-9\.]*"); };
+filter f_iptables	{ match("IN=[A-Za-z0-9\.]* OUT=[A-Za-z0-9\.]*" value("MESSAGE")); };
 
 log { source(s_sys); filter(f_authpriv);	destination(d_authlog); };
 log { source(s_sys); filter(f_cron);		destination(d_cron); };
@@ -133,3 +138,7 @@ log { source(s_sys); destination(d_messages); flags(fallback); };
 
 # Network syslogging
 #log { source(s_sys); destination(d_loghost); };
+
+
+# put any customization files in this directory
+@include "/etc/syslog-ng.d/*.conf"