X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=syslog-ng.conf;h=6380ab8e5d870f010c375f2df10da9175a5bb023;hb=HEAD;hp=8103f1183e06a92bd84c045c7dd9dd832d692fd9;hpb=34fd72d3df2e4e17f5a9c1425e665875b4daff3e;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 8103f11..3fe6235 100644
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.17
+@version: #VERSION#
 @include "scl.conf"
 #
 # Syslog-ng configuration for TLD Linux
@@ -7,32 +7,26 @@
 #
 
 options {
-	flush_lines(0);
-	owner(root);
-	group(logs);
-	perm(0640);
-	create_dirs(yes);
-	dir_owner(root);
-	dir_group(logs);
-	dir_perm(0750);
-	stats_freq(3600);
-	time_reopen(10);
-	time_reap(360);
-	mark_freq(600);
-	threaded(yes);
+    flush_lines(0);
+    owner(root);
+    group(logs);
+    perm(0640);
+    create_dirs(yes);
+    dir_owner(root);
+    dir_group(logs);
+    dir_perm(0750);
+    stats(freq(3600));
+    time_reopen(10);
+    time_reap(360);
+    mark_freq(600);
+    threaded(yes);
 };
 
 source s_sys {
-	system();
-	internal();
+    system();
+    internal();
 };
 
-# uncomment the line below and change ip/port if you want to run syslog server
-#source s_net	{ udp(ip(192.168.1.100),port(514)); };
-
-# uncomment the line bellow if you want to send logs to syslog server
-#destination d_loghost		{ udp("loghost" port(514)); };
-
 destination d_kern		{ file("/var/log/kernel"); };
 destination d_messages		{ file("/var/log/messages"); };
 destination d_authlog		{ file("/var/log/secure"); };
@@ -44,21 +38,13 @@ destination d_syslog		{ file("/var/log/syslog"); };
 destination d_daemon		{ file("/var/log/daemon"); };
 destination d_lpr		{ file("/var/log/lpr"); };
 destination d_user		{ file("/var/log/user"); };
-destination d_ppp		{ file("/var/log/ppp"); };
 destination d_ftp		{ file("/var/log/xferlog"); };
 destination d_audit		{ file("/var/log/audit"); };
-destination d_postgres		{ file("/var/log/pgsql"); };
-destination d_freshclam		{ file("/var/log/freshclam.log"); };
-destination d_shorewall		{ file("/var/log/shorewall"); };
 destination d_console		{ usertty("root"); };
 destination d_xconsole		{ pipe("/dev/xconsole"); };
 destination d_newscrit		{ file("/var/log/news/news.crit" owner(news) group(news)); };
 destination d_newserr		{ file("/var/log/news/news.err" owner(news) group(news)); };
 destination d_newsnotice	{ file("/var/log/news/news.notice" owner(news) group(news)); };
-destination d_dhcp		{ file("/var/log/dhcp"); };
-
-# uncomment the line below if you want to run syslog server
-#destination d_from_net	{ file("/var/log/$HOST.log" owner(root) group(root) perm(0644) dir_perm(0700) create_dirs(yes)); };
 
 # Filters for standard syslog(3) facilities
 #filter f_audit		{ facility(audit); };
@@ -92,24 +78,8 @@ filter p_alert		{ level(alert); };
 filter p_crit		{ level(crit); };
 filter p_emergency	{ level(emerg); };
 
-# Additional filters for specific programs/use
-filter f_freshclam	{ program(freshclam); };
-filter f_ppp		{ program(pppd) or program(chat); };
-filter f_postgres	{ program(postgres); };
-filter f_shorewall	{ facility(kern) and match("Shorewall:" value("MESSAGE")); };
-filter f_dhcp		{ program("dhcpd") or program("dnsmasq-dhcp"); };
-
-# uncomment the line below if you want to run syslog server
-#log { source(s_net); destination(d_from_net); flags(final); };
-
-# uncomment the line bellow if you want to send logs to syslog server
-#log { source(s_sys); destination(d_loghost); };
-
-# log shorewall to separate log file by default
-log { source(s_sys); filter(f_shorewall);			destination(d_shorewall); flags(final); };
-
-# log dhcp daemons to separate log file by default
-log { source(s_sys); filter(f_dhcp);				destination(d_dhcp); flags(final); };
+# Include additional configuration files
+@include "/etc/syslog-ng/conf.d/*.conf"
 
 log { source(s_sys); filter(f_authpriv);			destination(d_authlog); };
 log { source(s_sys); filter(f_cron);				destination(d_cron); };
@@ -131,9 +101,8 @@ log { source(s_sys); filter(f_uucp);				destination(d_uucp); };
 log { source(s_sys); filter(p_debug);				destination(d_debug); };
 log { source(s_sys); filter(f_daemon); filter(f_ppp);		destination(d_ppp); };
 log { source(s_sys); filter(f_local6); filter(f_freshclam);	destination(d_freshclam); };
-log { source(s_sys); filter(f_local0); filter(f_postgres);	destination(d_postgres); };
 log { source(s_sys); filter(p_emergency);			destination(d_console); };
 
-#  This is a catchall statement, and should catch all messages which were not
-#  accepted any of the previous statements.
+# This is a catchall statement and should catch any messages that were not
+# accepted by any of the previous log statements.
 log { source(s_sys); destination(d_messages); flags(fallback); };