Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-25 | 4 | -5/+5 |
|\ | |||||
| * | typo fix ("listner" vs. "listener") | Michael Biebl | 2013-06-25 | 4 | -5/+5 |
| | | |||||
* | | mmfields: add "jsonRoot" parameter | Rainer Gerhards | 2013-06-24 | 1 | -4/+15 |
| | | |||||
* | | doc: link mmfields doc to rest of doc set | Rainer Gerhards | 2013-06-23 | 1 | -0/+2 |
| | | | | | | | | ...forgotten in last commit ;) | ||||
* | | doc: add mmfields module | Rainer Gerhards | 2013-06-23 | 1 | -0/+80 |
| | | |||||
* | | doc: document tls.authMode parameter | Rainer Gerhards | 2013-06-21 | 2 | -0/+26 |
| | | |||||
* | | doc: imrelp & omrelp improvements | Rainer Gerhards | 2013-06-21 | 2 | -6/+32 |
| | | | | | | | | among others, fix doc done for wrong module... | ||||
* | | doc: add new imrelp parameter | Rainer Gerhards | 2013-06-20 | 1 | -0/+17 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-20 | 1 | -7/+7 |
|\| | |||||
| * | imptcp: improve doc | Rainer Gerhards | 2013-06-20 | 1 | -6/+6 |
| | | |||||
| * | doc bugfix: invalid parameter name | Rainer Gerhards | 2013-06-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-19 | 1 | -1/+1 |
|\| | |||||
| * | doc: imjournal doc correction | Tomas Heinrich | 2013-06-19 | 1 | -1/+1 |
| | | |||||
* | | Updated omprog documentation | Andre Lorbach | 2013-06-19 | 1 | -2/+28 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -38/+34 |
|\| | |||||
| * | doc: remove duplicate omfile descriptions | Rainer Gerhards | 2013-06-17 | 1 | -38/+34 |
| | | | | | | | | | | always bears the risk that one or another is not maintained when an update happpens | ||||
| * | prepare for 7.4.1 releasev7.4.1 | Rainer Gerhards | 2013-06-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -2/+2 |
|\| | |||||
| * | doc: legacy parameter description in imjournal slightly wrong | Rainer Gerhards | 2013-06-17 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -4/+10 |
|\| | |||||
| * | doc cleanup | Rainer Gerhards | 2013-06-17 | 1 | -5/+5 |
| | | |||||
| * | Add IgnorePreviousMessages option to imjournal. | Milan Bartos | 2013-06-17 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This option specifies whether imjournal should ignore messages that are currently in journal. This option is only used when there is no StateFile to avoid message loss. modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c Conflicts: doc/imjournal.html plugins/imjournal/imjournal.c | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -25/+18 |
|\| | | | | | | | | | Conflicts: doc/imjournal.html | ||||
| * | doc: improve imjournal doc | Rainer Gerhards | 2013-06-17 | 1 | -17/+19 |
| | | | | | | | | most importantly, convert sample to new-style config format | ||||
| * | fix imjournal doc after merging patch | Rainer Gerhards | 2013-06-17 | 1 | -11/+2 |
| | | | | | | | | | | ... was changed in the interim, so the result of the merge was sub-optimal ;) | ||||
| * | Merge branch 'tmp' into v7-stable | Rainer Gerhards | 2013-06-17 | 1 | -0/+11 |
| |\ | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c | ||||
| | * | Rename legacy imjournal configs to have "imjournal" prepended. | Milan Bartos | 2013-06-17 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c | ||||
| * | | doc bugfix: DynaFileCacheSize description in omfile was wrong | Rainer Gerhards | 2013-06-16 | 1 | -2/+6 |
| | | | | | | | | | | | | thanks to David Lang for alerting me. | ||||
| * | | doc: add journal presentation link to omjournal doc | Rainer Gerhards | 2013-06-16 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'tmp' | Rainer Gerhards | 2013-06-17 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c | ||||
| * | | | Rename legacy imjournal configs to have "imjournal" prepended. | Milan Bartos | 2013-06-17 | 1 | -0/+11 |
| | |/ | |/| | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c | ||||
* | | | doc bugfix: DynaFileCacheSize description in omfile was wrong | Rainer Gerhards | 2013-06-16 | 1 | -2/+6 |
| | | | | | | | | | | | | thanks to David Lang for alerting me. | ||||
* | | | doc: add journal presentation link to omjournal doc | Rainer Gerhards | 2013-06-16 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-16 | 1 | -8/+56 |
|\ \ \ | | |/ | |/| | |||||
| * | | doc: improve imjournal doc and add ratelimiting paramters | Rainer Gerhards | 2013-06-16 | 1 | -8/+56 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 1 | -0/+8 |
|\| | | |||||
| * | | doc: warn about using imjournal | Rainer Gerhards | 2013-06-15 | 1 | -0/+8 |
| | | | | | | | | | | | | do to bugs in systemd, the module can lead to a DoS to the local machine | ||||
| * | | doc bugfix: imrelp does not have a v6+ "ruleset" config parameter | Rainer Gerhards | 2013-06-10 | 1 | -4/+2 |
| |/ | |||||
* | | omrelp: add capability to directly specify GnuTLS priority string | Rainer Gerhards | 2013-06-12 | 2 | -0/+15 |
| | | |||||
* | | imrelp: add capability to directly specify GnuTLS priority string | Rainer Gerhards | 2013-06-12 | 1 | -0/+11 |
| | | |||||
* | | imrelp: new parameter "compression.dhbits" | Rainer Gerhards | 2013-06-12 | 1 | -0/+10 |
| | | | | | | | | | | which controls the number of bits being used for Diffie-Hellman key generation | ||||
* | | Merge branch 'master-tcp-compress-stream' | Rainer Gerhards | 2013-06-12 | 2 | -1/+37 |
|\ \ | |||||
| * | | doc: more on tcp compression modes | Rainer Gerhards | 2013-06-12 | 2 | -0/+7 |
| | | | |||||
| * | | document new tcp compression mode | Rainer Gerhards | 2013-06-12 | 1 | -1/+30 |
| | | | |||||
* | | | prepare 7.5.0 releasev7.5.0 | Rainer Gerhards | 2013-06-11 | 1 | -1/+1 |
| | | | |||||
* | | | imrelp: implement "ruleset" module parameter | Rainer Gerhards | 2013-06-10 | 1 | -6/+8 |
| | | | |||||
* | | | add minimal doc for contributed mmcount module | Rainer Gerhards | 2013-06-09 | 2 | -0/+59 |
| | | | |||||
* | | | [io]mrelp: add TLS compression support | Rainer Gerhards | 2013-06-07 | 2 | -2/+16 |
| | | | |||||
* | | | Merge branch 'nextmaster' | Rainer Gerhards | 2013-06-06 | 2 | -4/+10 |
|\ \ \ | |_|/ |/| | | | | | | | | Conflicts: ChangeLog | ||||
| * | | doc: describe relp tls parameters | Jan Gerhards | 2013-05-15 | 2 | -4/+10 |
| | | |