factory-default/app-admin/syslog-ng: Split net-firewall/iptables config

2 files changed, 15 insertions, 3 deletions

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 beca76c6..0cc8cd88 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,7 +57,6 @@ template t_logformat {
   template("${ISODATE} ${FACILITY}.${PRIORITY} ${HOST} ${MSGHDR}${MSGONLY}\n");
 };
 
-filter f_firewall      { facility(kern)     and match("IN=" value("MESSAGE")); };
 filter f_haproxy       { program("haproxy");                                   };
 filter f_apache_access { program("httpd")   and facility(local2);              };
 filter f_apache_error  { program("httpd")   and facility(local3);              };
@@ -65,12 +64,10 @@ filter f_php_error     { program("apache2") and facility(user);                }
 
 @include "/etc/syslog-ng/conf.d"
 
-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" ); };
 destination d_haproxy       { file("/var/log/haproxy.log"       ); };
 
-log { source(s_local); filter(f_firewall);      destination(d_firewall);      flags(final); };
 log { source(s_local); filter(f_haproxy);       destination(d_haproxy);       flags(final); };
 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); };
diff --git a/factory-default/net-firewall/iptables/etc/syslog-ng/conf.d/0200-iptables.conf b/factory-default/net-firewall/iptables/etc/syslog-ng/conf.d/0200-iptables.conf
new file mode 100644
index 00000000..d7763648
--- /dev/null
+++ b/factory-default/net-firewall/iptables/etc/syslog-ng/conf.d/0200-iptables.conf
@@ -0,0 +1,15 @@
+filter f_firewall {
+  facility(kern)
+  and match("IN=" value("MESSAGE"));
+};
+
+destination d_firewall {
+  file("/var/log/firewall.log");
+};
+
+log {
+  source(s_local);
+  filter(f_firewall);
+  destination(d_firewall);
+  flags(final);
+};