From ac5df6b5dd5030770c8252c31566e317c1a4085c Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Tue, 26 Jun 2018 21:52:17 +0100 Subject: factory-default/app-admin/syslog-ng: Bump to 3.16.1 --- .../syslog-ng-3.15.1/etc/logrotate.d/syslog-ng | 12 --- .../etc/syslog-ng/conf.d/0001-send-via-syslog.conf | 14 --- .../etc/syslog-ng/conf.d/0900-system.conf | 117 --------------------- .../syslog-ng-3.15.1/etc/syslog-ng/syslog-ng.conf | 60 ----------- .../syslog-ng-3.16.1/etc/logrotate.d/syslog-ng | 12 +++ .../etc/syslog-ng/conf.d/0001-send-via-syslog.conf | 14 +++ .../etc/syslog-ng/conf.d/0900-system.conf | 117 +++++++++++++++++++++ .../syslog-ng-3.16.1/etc/syslog-ng/syslog-ng.conf | 61 +++++++++++ 8 files changed, 204 insertions(+), 203 deletions(-) delete mode 100644 factory-default/app-admin/syslog-ng-3.15.1/etc/logrotate.d/syslog-ng delete mode 100644 factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf delete mode 100644 factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/conf.d/0900-system.conf delete mode 100644 factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/syslog-ng.conf create mode 100644 factory-default/app-admin/syslog-ng-3.16.1/etc/logrotate.d/syslog-ng create mode 100644 factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf create mode 100644 factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/conf.d/0900-system.conf create mode 100644 factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/syslog-ng.conf (limited to 'factory-default') diff --git a/factory-default/app-admin/syslog-ng-3.15.1/etc/logrotate.d/syslog-ng b/factory-default/app-admin/syslog-ng-3.15.1/etc/logrotate.d/syslog-ng deleted file mode 100644 index 9e10e0dd..00000000 --- a/factory-default/app-admin/syslog-ng-3.15.1/etc/logrotate.d/syslog-ng +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/auth.log -/var/log/cron.log -/var/log/daemon.log -/var/log/debug.log -/var/log/kern.log -/var/log/mail.log -/var/log/messages -/var/log/user.log { - postrotate - /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true - endscript -} diff --git a/factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf b/factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf deleted file mode 100644 index 003145d6..00000000 --- a/factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf +++ /dev/null @@ -1,14 +0,0 @@ -destination d_log.pants-on.net { - syslog("log.pants-on.net" - transport(tls) - tls(ca_dir("/etc/ssl/certs") - peer_verify(required-trusted) - cipher-suite(AES256-GCM-SHA384) - ) - ); -}; - -log { - source(s_local); - destination(d_log.pants-on.net); -}; diff --git a/factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/conf.d/0900-system.conf b/factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/conf.d/0900-system.conf deleted file mode 100644 index 970f99f3..00000000 --- a/factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/conf.d/0900-system.conf +++ /dev/null @@ -1,117 +0,0 @@ -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-3.15.1/etc/syslog-ng/syslog-ng.conf b/factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index f952b658..00000000 --- a/factory-default/app-admin/syslog-ng-3.15.1/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,60 +0,0 @@ -@version: 3.15 - -@module system-source - -options { - flush-lines (0); - time-reopen (10); - log-fifo-size (10000); - use-dns (no); - use-fqdn (no); - - create-dirs (yes); - dir-owner ("root"); - dir-group ("wheel"); - dir-perm (0750); - - owner ("root"); - group ("wheel"); - perm (0640); - - keep-hostname (no); - log-msg-size (2048); - chain-hostnames (no); - - # The default action of syslog-ng is to log a STATS line - # to the file every 10 minutes. That's pretty ugly after a while. - # Change it to every 1 hour so you get a nice daily update of - # how many messages syslog-ng missed (0). - stats-freq(3600); - - # The default action of syslog-ng is to log a MARK line - # to the file every 20 minutes. That's seems high for most - # people so turn it down to once an hour. Set it to zero - # if you don't want the functionality at all. - mark-freq(3600); - - file-template (t_logformat); -}; - -source s_local { - # To collect warnings, errors and notices from syslog-ng itself - internal(); - - # Automatically collect the system-specific log messages of the host - # on a number of platforms - # - # Linux: - # unix-dgram("/dev/log"); - # file("/proc/kmsg" program-override("kernel") flags(kernel)); - system(); - - # BSD syslog protocol - udp(ip(127.0.0.1)); -}; - -template t_logformat { - template("${ISODATE} ${FACILITY}.${PRIORITY} ${HOST} ${MSGHDR}${MSGONLY}\n"); -}; - -@include "/etc/syslog-ng/conf.d" diff --git a/factory-default/app-admin/syslog-ng-3.16.1/etc/logrotate.d/syslog-ng b/factory-default/app-admin/syslog-ng-3.16.1/etc/logrotate.d/syslog-ng new file mode 100644 index 00000000..9e10e0dd --- /dev/null +++ b/factory-default/app-admin/syslog-ng-3.16.1/etc/logrotate.d/syslog-ng @@ -0,0 +1,12 @@ +/var/log/auth.log +/var/log/cron.log +/var/log/daemon.log +/var/log/debug.log +/var/log/kern.log +/var/log/mail.log +/var/log/messages +/var/log/user.log { + postrotate + /etc/init.d/syslog-ng reload > /dev/null 2>&1 || true + endscript +} diff --git a/factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf b/factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf new file mode 100644 index 00000000..003145d6 --- /dev/null +++ b/factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf @@ -0,0 +1,14 @@ +destination d_log.pants-on.net { + syslog("log.pants-on.net" + transport(tls) + tls(ca_dir("/etc/ssl/certs") + peer_verify(required-trusted) + cipher-suite(AES256-GCM-SHA384) + ) + ); +}; + +log { + source(s_local); + destination(d_log.pants-on.net); +}; diff --git a/factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/conf.d/0900-system.conf b/factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/conf.d/0900-system.conf new file mode 100644 index 00000000..970f99f3 --- /dev/null +++ b/factory-default/app-admin/syslog-ng-3.16.1/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-3.16.1/etc/syslog-ng/syslog-ng.conf b/factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/syslog-ng.conf new file mode 100644 index 00000000..e0e20d09 --- /dev/null +++ b/factory-default/app-admin/syslog-ng-3.16.1/etc/syslog-ng/syslog-ng.conf @@ -0,0 +1,61 @@ +@version: 3.16 + +@module system-source + +options { + flush-lines (0); + time-reopen (10); + log-fifo-size (10000); + use-dns (no); + dns-cache (no); + use-fqdn (no); + + create-dirs (yes); + dir-owner ("root"); + dir-group ("wheel"); + dir-perm (0750); + + owner ("root"); + group ("wheel"); + perm (0640); + + keep-hostname (no); + log-msg-size (2048); + chain-hostnames (no); + + # The default action of syslog-ng is to log a STATS line + # to the file every 10 minutes. That's pretty ugly after a while. + # Change it to every 1 hour so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats-freq(3600); + + # The default action of syslog-ng is to log a MARK line + # to the file every 20 minutes. That's seems high for most + # people so turn it down to once an hour. Set it to zero + # if you don't want the functionality at all. + mark-freq(3600); + + file-template (t_logformat); +}; + +source s_local { + # To collect warnings, errors and notices from syslog-ng itself + internal(); + + # Automatically collect the system-specific log messages of the host + # on a number of platforms + # + # Linux: + # unix-dgram("/dev/log"); + # file("/proc/kmsg" program-override("kernel") flags(kernel)); + system(); + + # BSD syslog protocol + udp(ip(127.0.0.1)); +}; + +template t_logformat { + template("${ISODATE} ${FACILITY}.${PRIORITY} ${HOST} ${MSGHDR}${MSGONLY}\n"); +}; + +@include "/etc/syslog-ng/conf.d" -- cgit v1.2.3