From 4d6612545d8ab534a332ebf1d5900207f84f78ee Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 29 Oct 2015 07:45:46 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- config-archive/etc/syslog-ng/syslog-ng.conf | 2 +- config-archive/etc/syslog-ng/syslog-ng.conf.1 | 4 +- config-archive/etc/syslog-ng/syslog-ng.conf.2 | 10 +- config-archive/etc/syslog-ng/syslog-ng.conf.3 | 21 +++-- config-archive/etc/syslog-ng/syslog-ng.conf.4 | 94 +++++++++++++++++++ .../etc/syslog-ng/syslog-ng.conf.dist | 2 +- syslog-ng/syslog-ng.conf | 2 +- 7 files changed, 118 insertions(+), 17 deletions(-) create mode 100644 config-archive/etc/syslog-ng/syslog-ng.conf.4 diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf b/config-archive/etc/syslog-ng/syslog-ng.conf index 0f1001a0..e884810f 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf +++ b/config-archive/etc/syslog-ng/syslog-ng.conf @@ -1,5 +1,5 @@ @version: 3.6 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $ +# $Id$ # # Syslog-ng default configuration file for Gentoo Linux diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.1 b/config-archive/etc/syslog-ng/syslog-ng.conf.1 index 7bdc55cd..0f1001a0 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.1 +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.1 @@ -1,5 +1,5 @@ -@version: 3.4 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $ +@version: 3.6 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $ # # Syslog-ng default configuration file for Gentoo Linux diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.2 b/config-archive/etc/syslog-ng/syslog-ng.conf.2 index 20e93366..7bdc55cd 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.2 +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.2 @@ -1,10 +1,13 @@ -@version: 3.2 -# $Header: /etc/syslog-ng/.rcs/syslog-ng.conf,v 1.3 2011/07/11 07:20:59 root Exp $ +@version: 3.4 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $ # # Syslog-ng default configuration file for Gentoo Linux +# https://bugs.gentoo.org/show_bug.cgi?id=426814 +@include "scl.conf" + options { - long_hostnames(off); + threaded(yes); chain_hostnames(no); flush_lines(0); @@ -25,6 +28,7 @@ options { source src { unix-stream("/dev/log" max-connections(256)); + system(); internal(); file("/proc/kmsg"); #udp(); diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.3 b/config-archive/etc/syslog-ng/syslog-ng.conf.3 index 45827938..20e93366 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.3 +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.3 @@ -18,20 +18,23 @@ options { # 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); + + frac_digits(3); + ts_format(iso); }; source src { unix-stream("/dev/log" max-connections(256)); internal(); file("/proc/kmsg"); - udp(); + #udp(); }; ######################################################### # Logging-Ziele destination d_syslog { file("/var/log/syslog"); }; -destination d_fac { file("/var/log/facility/$FACILITY"); }; +destination d_fac { file("/var/log/syslog.d/$FACILITY"); }; destination d_debug { file("/var/log/debug"); }; destination d_all { file("/var/log/all"); }; destination d_messages { file("/var/log/messages"); }; @@ -50,6 +53,13 @@ destination d_console_12 { file("/dev/tty12"); }; #destination d_xconsole { pipe("/dev/xconsole"); }; destination d_xconsole { pipe("/dev/console"); }; +# By default messages are logged to tty12... +#destination console_all { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + ######################################################### # Filter-Definitionen @@ -83,12 +93,5 @@ log { source(src); filter(f_syslog); destination(d_syslog); }; log { source(src); filter(f_debug); destination(d_debug); }; log { source(src); destination(d_all); }; -# By default messages are logged to tty12... -destination console_all { file("/dev/tty12"); }; -# ...if you intend to use /dev/console for programs like xconsole -# you can comment out the destination line above that references /dev/tty12 -# and uncomment the line below. -#destination console_all { file("/dev/console"); }; - #log { source(src); destination(messages); }; #log { source(src); destination(console_all); }; diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.4 b/config-archive/etc/syslog-ng/syslog-ng.conf.4 new file mode 100644 index 00000000..45827938 --- /dev/null +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.4 @@ -0,0 +1,94 @@ +@version: 3.2 +# $Header: /etc/syslog-ng/.rcs/syslog-ng.conf,v 1.3 2011/07/11 07:20:59 root Exp $ +# +# Syslog-ng default configuration file for Gentoo Linux + +options { + long_hostnames(off); + chain_hostnames(no); + flush_lines(0); + + # 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 12 hours so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats_freq(43200); + # 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); +}; + +source src { + unix-stream("/dev/log" max-connections(256)); + internal(); + file("/proc/kmsg"); + udp(); +}; + +######################################################### +# Logging-Ziele + +destination d_syslog { file("/var/log/syslog"); }; +destination d_fac { file("/var/log/facility/$FACILITY"); }; +destination d_debug { file("/var/log/debug"); }; +destination d_all { file("/var/log/all"); }; +destination d_messages { file("/var/log/messages"); }; + +destination d_console { usertty("root"); }; +destination d_console_all { usertty("*"); }; +#destination loghost { udp("loghost" port(999)); }; + +# By default messages are logged to tty12... +destination d_console_12 { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +#destination d_xconsole { pipe("/dev/xconsole"); }; +destination d_xconsole { pipe("/dev/console"); }; + +######################################################### +# Filter-Definitionen + +filter f_syslog { not facility(authpriv, mail); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..emerg) + and not facility(auth, authpriv, mail, news); }; +filter f_emergency { level(emerg); }; + +filter f_warnings { level(warn..emerg) + and not facility( mail, news); }; + +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_alarm { level(crit, alert); }; + +######################################################## +# Log-Definitionen + +log { source(src); destination(d_fac); }; + +log { source(src); filter(f_messages); destination(d_messages); }; +#log { source(src); filter(f_messages); destination(d_xconsole); }; +log { source(src); filter(f_warnings); destination(d_console_12); }; +log { source(src); filter(f_alarm); destination(d_console); }; +log { source(src); filter(f_emergency); destination(d_console_all); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); destination(d_all); }; + +# By default messages are logged to tty12... +destination console_all { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +#log { source(src); destination(messages); }; +#log { source(src); destination(console_all); }; diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.dist b/config-archive/etc/syslog-ng/syslog-ng.conf.dist index 77dacb88..d8601270 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.dist +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.dist @@ -1,4 +1,4 @@ -@version: 3.6 +@version: 3.7 # $Id$ # # Syslog-ng default configuration file for Gentoo Linux diff --git a/syslog-ng/syslog-ng.conf b/syslog-ng/syslog-ng.conf index e884810f..dc34c9b7 100644 --- a/syslog-ng/syslog-ng.conf +++ b/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.6 +@version: 3.7 # $Id$ # # Syslog-ng default configuration file for Gentoo Linux -- 2.39.5