summaryrefslogtreecommitdiff
path: root/factory-default
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2016-09-18 22:23:58 +0100
committerBertrand Jacquin <bertrand@jacquin.bzh>2016-09-18 23:53:38 +0100
commit6caf079be6c4c7fbe567ed686925174188535d53 (patch)
tree94603c8de04f9d8482aed7ce52b437e09b818e9b /factory-default
parentfactory-default/app-admin/syslog-ng: Split net-firewall/iptables config (diff)
downloadportage-6caf079be6c4c7fbe567ed686925174188535d53.tar.xz
factory-default/app-admin/syslog-ng: Split net-proxy/haproxy config
Diffstat (limited to 'factory-default')
-rw-r--r--factory-default/app-admin/syslog-ng/etc/syslog-ng/syslog-ng.conf3
-rw-r--r--factory-default/net-proxy/haproxy/etc/syslog-ng/conf.d/0200-haproxy.conf14
2 files changed, 14 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 0cc8cd88..f934f368 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_haproxy { program("haproxy"); };
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); };
@@ -66,9 +65,7 @@ filter f_php_error { program("apache2") and facility(user); }
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_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); };
log { source(s_local); filter(f_php_error); destination(d_apache_error); flags(final); };
diff --git a/factory-default/net-proxy/haproxy/etc/syslog-ng/conf.d/0200-haproxy.conf b/factory-default/net-proxy/haproxy/etc/syslog-ng/conf.d/0200-haproxy.conf
new file mode 100644
index 00000000..897a2e5e
--- /dev/null
+++ b/factory-default/net-proxy/haproxy/etc/syslog-ng/conf.d/0200-haproxy.conf
@@ -0,0 +1,14 @@
+filter f_haproxy {
+ program("haproxy");
+};
+
+destination d_haproxy {
+ file("/var/log/haproxy.log");
+};
+
+log {
+ source(s_local);
+ filter(f_haproxy);
+ destination(d_haproxy);
+ flags(final);
+};