Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-02 | 2 | -2/+6 | |
| |\| | | | | | | ||||||
| | * | | | | | | Fix for "/run/systemd/journal/syslog" detection | Marius Tomaschewski | 2012-03-02 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed to check "/run/systemd/journal" directory and not the socket, as the socket may not exists [e.g. is not activated]. | |||||
| | * | | | | | | Install syslog.service Alias for newer systemd versions | Michael Biebl | 2012-03-02 | 1 | -0/+1 | |
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the syslog.socket unit file of newer systemd versions: The default syslog implementation should make syslog.service a symlink to itself, so that this socket activates the right actual syslog service. Examples: /etc/systemd/system/syslog.service -> /lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service -> /lib/systemd/system/syslog-ng.service Best way to achieve that is by adding this to your unit file (i.e. to rsyslog.service or syslog-ng.service): [Install] Alias=syslog.service http://cgit.freedesktop.org/systemd/systemd/tree/units/syslog.socket#n26 | |||||
* | | | | | | | screwed up during merge - solving that mess ;) | Rainer Gerhards | 2012-03-01 | 1 | -65/+6 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-01 | 1 | -0/+68 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c | |||||
| * | | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-01 | 1 | -0/+9 | |
| |\| | | | | | ||||||
| | * | | | | | Detect if to use /run/systemd/journal/syslog under systemd | Marius Tomaschewski | 2012-03-01 | 1 | -0/+9 | |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect if we have to use the new /run/systemd/journal/syslog socket instead of the /dev/log under newer systemd versions. Signed-off-by: Marius Tomaschewski <mt@suse.com> | |||||
* | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-03-01 | 2 | -2/+6 | |
|\| | | | | | ||||||
| * | | | | | mentioned imported bugfix in ChangeLog | Rainer Gerhards | 2012-03-01 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-03-01 | 2 | -2/+4 | |
| |\| | | | | ||||||
| | * | | | | bugfix: imklog invalidly computed facility and severity | Rainer Gerhards | 2012-03-01 | 2 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 | |||||
* | | | | | | new code works with libee 0.4.0 as well | Rainer Gerhards | 2012-03-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | so we do not need to require the newer version | |||||
* | | | | | | changes needed for libee 0.4.2 | Rainer Gerhards | 2012-02-28 | 2 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | milestone: parsing audit message almost correct | Rainer Gerhards | 2012-02-24 | 1 | -9/+133 | |
| | | | | | | ||||||
* | | | | | | mmaudit: added skeleton (copy of mmjsonparse) | Rainer Gerhards | 2012-02-23 | 4 | -0/+286 | |
| | | | | | | ||||||
* | | | | | | mmjsonparse: changed cookie back to @cee: after discussion with Balabit | Rainer Gerhards | 2012-02-22 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | added mmjsonparse to support recognizing and parsing JSON enhanced syslog ↵ | Rainer Gerhards | 2012-02-21 | 5 | -3/+282 | |
| | | | | | | | | | | | | | | | | | | | | | | | | messages | |||||
* | | | | | | bugfix: property $!all-json made rsyslog abort if no normalized data is ↵ | Rainer Gerhards | 2012-02-21 | 2 | -4/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | available | |||||
* | | | | | | dns cache: working on invalid resolution bug, again | Rainer Gerhards | 2012-02-09 | 4 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | the proposed solution did not work out well... | |||||
* | | | | | | dns cache: experimental fix for name resulution problem | Rainer Gerhards | 2012-02-08 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog | Rainer Gerhards | 2012-02-08 | 2 | -31/+28 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | dns chache: added some more error instrumentation | Rainer Gerhards | 2012-02-06 | 2 | -31/+28 | |
| | | | | | | | ||||||
* | | | | | | | omsnmp: support for new config system added & some refactoring | Rainer Gerhards | 2012-02-08 | 2 | -100/+146 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 | |
|\| | | | | | ||||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 | |
| |\| | | | | ||||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 | |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | | * | | | ommysql: put under ASL 2.0 | Rainer Gerhards | 2012-02-03 | 1 | -16/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET) | |||||
* | | | | | | upgraded omlibdbi to support the new v6 config format | Rainer Gerhards | 2012-02-02 | 3 | -24/+119 | |
| | | | | | | ||||||
* | | | | | | ommysql: updated doc | Rainer Gerhards | 2012-02-02 | 1 | -16/+30 | |
| | | | | | | ||||||
* | | | | | | bugfix: abort during startup when rsyslog.conf v6+ format was used in a ↵ | Rainer Gerhards | 2012-02-02 | 5 | -6/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | certain way | |||||
* | | | | | | ommysql: added support for v6 config format | Rainer Gerhards | 2012-02-02 | 3 | -0/+118 | |
| | | | | | | ||||||
* | | | | | | nit: release date for 6.3.7v6.3.7 | Rainer Gerhards | 2012-02-02 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | cleanup: remove code for no-longer needed legacy conf functionality | Rainer Gerhards | 2012-02-01 | 3 | -8/+5 | |
| | | | | | | ||||||
* | | | | | | conf file: bufgix: legacy parsing of some filters did not work correctly | Rainer Gerhards | 2012-02-01 | 4 | -6/+6 | |
| | | | | | | ||||||
* | | | | | | omsnmp: fixing compile problem | Rainer Gerhards | 2012-02-01 | 2 | -4/+3 | |
| | | | | | | ||||||
* | | | | | | omgssapi: fix compile errors | Rainer Gerhards | 2012-02-01 | 1 | -9/+2 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-02-01 | 1 | -4/+4 | |
|\| | | | | | ||||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-02-01 | 0 | -0/+0 | |
| |\| | | | | ||||||
| | * | | | | undoing last commit: wrong branch | Rainer Gerhards | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | indicated special version | Rainer Gerhards | 2012-01-30 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | omgssapi: made recompile again | Rainer Gerhards | 2012-02-01 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but this version seems to have a problem, a fix as part of a rewrite is underway. Just wanted to keep things in the same state as before the interface change. | |||||
* | | | | | | preparing for 6.3.7 | Rainer Gerhards | 2012-01-31 | 3 | -44/+35 | |
| | | | | | | ||||||
* | | | | | | bugfix: rsyslog aborted during startup if there is an error in loading an action | Rainer Gerhards | 2012-01-27 | 4 | -24/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | and legacy configuration mode is used | |||||
* | | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-27 | 6 | -47/+62 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h | |||||
| * | | | | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-27 | 8 | -48/+69 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h | |||||
| | * | | | | added merged v4 bugfix info to changelog | Rainer Gerhards | 2012-01-27 | 1 | -0/+4 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2012-01-27 | 7 | -47/+59 | |
| | |\| | | | ||||||
| | | * | | | bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵ | Rainer Gerhards | 2012-01-27 | 3 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | configured | |||||
| | | * | | | relicense unlimited_select.h under ASL 2.0 | Rainer Gerhards | 2012-01-26 | 1 | -15/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after receiving permission from Red Hat legal (given in email from Tomas Heinrich) | |||||
| | | * | | | increased max config file line size to 64k | Rainer Gerhards | 2012-01-24 | 2 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug) |