factory-default/app-admin/syslog-ng: Split www-servers/apache config

2 files changed, 31 insertions, 7 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 f934f368..d6d670fa 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,8 @@ template t_logformat {
   template("${ISODATE} ${FACILITY}.${PRIORITY} ${HOST} ${MSGHDR}${MSGONLY}\n");
 };
 
-filter f_apache_access { program("httpd")   and facility(local2);              };
-filter f_apache_error  { program("httpd")   and facility(local3);              };
 filter f_php_error     { program("apache2") and facility(user);                };
 
 @include "/etc/syslog-ng/conf.d"
 
-destination d_apache_access { file("/var/log/apache2/access.log"); };
-destination d_apache_error  { file("/var/log/apache2/error.log" ); };
-
-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); };
diff --git a/factory-default/www-servers/apache/etc/syslog-ng/conf.d/0200-apache.conf b/factory-default/www-servers/apache/etc/syslog-ng/conf.d/0200-apache.conf
new file mode 100644
index 00000000..d5afa900
--- /dev/null
+++ b/factory-default/www-servers/apache/etc/syslog-ng/conf.d/0200-apache.conf
@@ -0,0 +1,31 @@
+filter f_apache_access {
+  program("httpd")
+  and facility(local2);
+};
+
+filter f_apache_error {
+  program("httpd")
+  and facility(local3);
+};
+
+destination d_apache_access {
+  file("/var/log/apache2/access.log");
+};
+
+destination d_apache_error {
+  file("/var/log/apache2/error.log");
+};
+
+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);
+};