diff options
13 files changed, 3 insertions, 423 deletions
diff --git a/factory-default/app-admin/syslog-ng-3.23.1/etc/logrotate.d/syslog-ng b/factory-default/app-admin/syslog-ng-3.23.1/etc/logrotate.d/syslog-ng deleted file mode 100644 index 9e10e0dd..00000000 --- a/factory-default/app-admin/syslog-ng-3.23.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.23.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf b/factory-default/app-admin/syslog-ng-3.23.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf deleted file mode 100644 index 1ba63a13..00000000 --- a/factory-default/app-admin/syslog-ng-3.23.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf +++ /dev/null @@ -1,17 +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) - ssl-options(no-sslv2, no-sslv3, no-tlsv1, no-tlsv11) - ecdh-curve-list("prime256v1:secp384r1:secp521r1") - cipher-suite("ECDHE-RSA-AES256-GCM-SHA384") - allow-compress(no) - ) - ); -}; - -log { - source(s_local); - destination(d_log.pants-on.net); -}; diff --git a/factory-default/app-admin/syslog-ng-3.23.1/etc/syslog-ng/conf.d/0900-system.conf b/factory-default/app-admin/syslog-ng-3.23.1/etc/syslog-ng/conf.d/0900-system.conf deleted file mode 100644 index 970f99f3..00000000 --- a/factory-default/app-admin/syslog-ng-3.23.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.23.1/etc/syslog-ng/syslog-ng.conf b/factory-default/app-admin/syslog-ng-3.23.1/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index ee1bae5a..00000000 --- a/factory-default/app-admin/syslog-ng-3.23.1/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,61 +0,0 @@ -@version: 3.23 - -@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 - network(transport("udp") localip(127.0.0.1) use-dns(no)); -}; - -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.23.1/etc/tmpfiles.d/100-syslog-ng.conf b/factory-default/app-admin/syslog-ng-3.23.1/etc/tmpfiles.d/100-syslog-ng.conf deleted file mode 100644 index 598d30db..00000000 --- a/factory-default/app-admin/syslog-ng-3.23.1/etc/tmpfiles.d/100-syslog-ng.conf +++ /dev/null @@ -1,3 +0,0 @@ -d /run/syslog-ng 0700 root root 1w - -R /var/log - - - - - -L /var/log - - - - /run/syslog-ng diff --git a/factory-default/app-admin/syslog-ng-3.24.1/etc/logrotate.d/syslog-ng b/factory-default/app-admin/syslog-ng-3.24.1/etc/logrotate.d/syslog-ng deleted file mode 100644 index 9e10e0dd..00000000 --- a/factory-default/app-admin/syslog-ng-3.24.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.24.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf b/factory-default/app-admin/syslog-ng-3.24.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf deleted file mode 100644 index 6ea9e58e..00000000 --- a/factory-default/app-admin/syslog-ng-3.24.1/etc/syslog-ng/conf.d/0001-send-via-syslog.conf +++ /dev/null @@ -1,18 +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) - sni(yes) - ssl-options(no-sslv2, no-sslv3, no-tlsv1, no-tlsv11) - ecdh-curve-list("prime256v1:secp384r1:secp521r1") - cipher-suite("ECDHE-RSA-AES256-GCM-SHA384") - allow-compress(no) - ) - ); -}; - -log { - source(s_local); - destination(d_log.pants-on.net); -}; diff --git a/factory-default/app-admin/syslog-ng-3.24.1/etc/syslog-ng/conf.d/0900-system.conf b/factory-default/app-admin/syslog-ng-3.24.1/etc/syslog-ng/conf.d/0900-system.conf deleted file mode 100644 index 970f99f3..00000000 --- a/factory-default/app-admin/syslog-ng-3.24.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.24.1/etc/syslog-ng/syslog-ng.conf b/factory-default/app-admin/syslog-ng-3.24.1/etc/syslog-ng/syslog-ng.conf deleted file mode 100644 index 41a6eaf2..00000000 --- a/factory-default/app-admin/syslog-ng-3.24.1/etc/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,61 +0,0 @@ -@version: 3.24 - -@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 - network(transport("udp") localip(127.0.0.1) use-dns(no)); -}; - -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.24.1/etc/tmpfiles.d/100-syslog-ng.conf b/factory-default/app-admin/syslog-ng-3.24.1/etc/tmpfiles.d/100-syslog-ng.conf deleted file mode 100644 index 598d30db..00000000 --- a/factory-default/app-admin/syslog-ng-3.24.1/etc/tmpfiles.d/100-syslog-ng.conf +++ /dev/null @@ -1,3 +0,0 @@ -d /run/syslog-ng 0700 root root 1w - -R /var/log - - - - - -L /var/log - - - - /run/syslog-ng diff --git a/factory-default/app-admin/syslog-ng/etc/syslog-ng/conf.d/0001-send-via-syslog.conf b/factory-default/app-admin/syslog-ng/etc/syslog-ng/conf.d/0001-send-via-syslog.conf index 1ba63a13..6ea9e58e 100644 --- a/factory-default/app-admin/syslog-ng/etc/syslog-ng/conf.d/0001-send-via-syslog.conf +++ b/factory-default/app-admin/syslog-ng/etc/syslog-ng/conf.d/0001-send-via-syslog.conf @@ -3,6 +3,7 @@ destination d_log.pants-on.net { transport(tls) tls(ca_dir("/etc/ssl/certs") peer_verify(required-trusted) + sni(yes) ssl-options(no-sslv2, no-sslv3, no-tlsv1, no-tlsv11) ecdh-curve-list("prime256v1:secp384r1:secp521r1") cipher-suite("ECDHE-RSA-AES256-GCM-SHA384") 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 b1bb4478..16d16f57 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 @@ -1,4 +1,4 @@ -@version: 3.22 +@version: 3.26 @module system-source diff --git a/factory-default/app-admin/syslog-ng/etc/tmpfiles.d/100-syslog-ng.conf b/factory-default/app-admin/syslog-ng/etc/tmpfiles.d/100-syslog-ng.conf index 598d30db..abaa99c5 100644 --- a/factory-default/app-admin/syslog-ng/etc/tmpfiles.d/100-syslog-ng.conf +++ b/factory-default/app-admin/syslog-ng/etc/tmpfiles.d/100-syslog-ng.conf @@ -1,3 +1,3 @@ -d /run/syslog-ng 0700 root root 1w - +d /run/syslog-ng 0755 root root 1w - R /var/log - - - - - L /var/log - - - - /run/syslog-ng |