2 files changed, 117 insertions, 28 deletions
diff --git a/factory-default/app-admin/syslog-ng/etc/syslog-ng/conf.d/0900-system.conf b/factory-default/app-admin/syslog-ng/etc/syslog-ng/conf.d/0900-system.conf
new file mode 100644
index 00000000..970f99f3
--- /dev/null
+++ b/factory-default/app-admin/syslog-ng/etc/syslog-ng/conf.d/0900-system.conf
@@ -0,0 +1,117 @@
+filter f_auth   {
+  facility(auth, authpriv);
+};
+
+filter f_cron {
+  facility(cron);
+};
+
+filter f_daemon {
+  facility(daemon);
+};
+
+filter f_kernel {
+  facility(kern);
+};
+
+filter f_mail {
+  facility(mail);
+};
+
+filter f_user {
+  facility(user);
+};
+
+filter f_emerg {
+  level(emerg);
+};
+
+filter f_debug {
+  level(debug);
+};
+
+destination d_auth {
+  file("/var/log/auth.log");
+};
+
+destination d_cron {
+  file("/var/log/cron.log");
+};
+
+destination d_daemon {
+  file("/var/log/daemon.log");
+};
+
+destination d_kernel {
+  file("/var/log/kern.log");
+};
+
+destination d_mail {
+  file("/var/log/mail.log");
+};
+
+destination d_messages {
+  file("/var/log/messages");
+};
+
+destination d_user {
+  file("/var/log/user.log");
+};
+
+destination d_debug {
+  file("/var/log/debug.log");
+};
+
+log {
+  source(s_local);
+  filter(f_auth);
+  destination(d_auth);
+  flags(final);
+};
+
+log {
+  source(s_local);
+  filter(f_cron);
+  destination(d_cron);
+  flags(final);
+};
+
+log {
+  source(s_local);
+  filter(f_daemon);
+  destination(d_daemon);
+  flags(final);
+};
+
+log {
+  source(s_local);
+  filter(f_kernel);
+  destination(d_kernel);
+  flags(final);
+};
+
+log {
+  source(s_local);
+  filter(f_mail);
+  destination(d_mail);
+  flags(final);
+};
+
+log {
+  source(s_local);
+  filter(f_user);
+  destination(d_user);
+  flags(final);
+};
+
+log {
+  source(s_local);
+  filter(f_debug);
+  destination(d_debug);
+  flags(final);
+};
+
+log {
+  source(s_local);
+  destination(d_messages);
+};
diff --git a/factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf b/factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf
index d941a475..beca76c6 100644
--- a/factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf
+++ b/factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf
@@ -57,15 +57,6 @@ template t_logformat {
   template("${ISODATE} ${FACILITY}.${PRIORITY} ${HOST} ${MSGHDR}${MSGONLY}\n");
 };
 
-filter f_auth   { facility(auth, authpriv); };
-filter f_cron   { facility(cron);           };
-filter f_daemon { facility(daemon);         };
-filter f_kernel { facility(kern);           };
-filter f_mail   { facility(mail);           };
-filter f_user   { facility(user);           };
-filter f_emerg  { level(emerg);             };
-filter f_debug  { level(debug) and not facility(auth, authpriv, news, mail); };
-
 filter f_firewall      { facility(kern)     and match("IN=" value("MESSAGE")); };
 filter f_haproxy       { program("haproxy");                                   };
 filter f_apache_access { program("httpd")   and facility(local2);              };
@@ -74,15 +65,6 @@ filter f_php_error     { program("apache2") and facility(user);                }
 
 @include "/etc/syslog-ng/conf.d"
 
-destination d_auth          { file("/var/log/auth.log"          ); };
-destination d_cron          { file("/var/log/cron.log"          ); };
-destination d_daemon        { file("/var/log/daemon.log"        ); };
-destination d_kernel        { file("/var/log/kern.log"          ); };
-destination d_mail          { file("/var/log/mail.log"          ); };
-destination d_messages      { file("/var/log/messages"          ); };
-destination d_user          { file("/var/log/user.log"          ); };
-destination d_debug         { file("/var/log/debug.log"         ); };
-
 destination d_firewall      { file("/var/log/firewall.log"      ); };
 destination d_apache_access { file("/var/log/apache2/access.log"); };
 destination d_apache_error  { file("/var/log/apache2/error.log" ); };
@@ -93,13 +75,3 @@ log { source(s_local); filter(f_haproxy);       destination(d_haproxy);       fl
 log { source(s_local); filter(f_apache_access); destination(d_apache_access); flags(final); };
 log { source(s_local); filter(f_apache_error);  destination(d_apache_error);  flags(final); };
 log { source(s_local); filter(f_php_error);     destination(d_apache_error);  flags(final); };
-
-log { source(s_local); filter(f_auth);     destination(d_auth);     flags(final); };
-log { source(s_local); filter(f_cron);     destination(d_cron);     flags(final); };
-log { source(s_local); filter(f_daemon);   destination(d_daemon);   flags(final); };
-log { source(s_local); filter(f_kernel);   destination(d_kernel);   flags(final); };
-log { source(s_local); filter(f_mail);     destination(d_mail);     flags(final); };
-log { source(s_local); filter(f_user);     destination(d_user);     flags(final); };
-log { source(s_local); filter(f_debug);    destination(d_debug);    flags(final); };
-
-log { source(s_local); destination(d_messages); };