From 83a48e8958c0fcba9778117f235e6064b401f3a1 Mon Sep 17 00:00:00 2001 From: Casper Date: Sun, 3 Mar 2024 22:48:42 +0100 Subject: [PATCH 1/2] Fail2ban logrotate interval/count: substitute only when necessary (#3919) --- CHANGELOG.md | 2 +- target/scripts/startup/setup.d/security/misc.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30c7dd0c..b60a7afa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,7 +66,7 @@ The most noteworthy change of this release is the update of the container's base - **Environment Variables:** - `LOGROTATE_COUNT` defines the number of files kept by logrotate ([#3907](https://github.com/docker-mailserver/docker-mailserver/pull/3907)) - - The fail2ban log file is now also taken into account by `LOGROTATE_COUNT` and `LOGROTATE_INTERVAL` ([#3915](https://github.com/docker-mailserver/docker-mailserver/pull/3915)) + - The fail2ban log file is now also taken into account by `LOGROTATE_COUNT` and `LOGROTATE_INTERVAL` ([#3915](https://github.com/docker-mailserver/docker-mailserver/pull/3915), [#3919](https://github.com/docker-mailserver/docker-mailserver/pull/3919)) ### Updates diff --git a/target/scripts/startup/setup.d/security/misc.sh b/target/scripts/startup/setup.d/security/misc.sh index df810b2e..303ae62d 100644 --- a/target/scripts/startup/setup.d/security/misc.sh +++ b/target/scripts/startup/setup.d/security/misc.sh @@ -209,8 +209,8 @@ function __setup__security__fail2ban() { rm -f /etc/logrotate.d/fail2ban fi _log 'trace' 'Configuring fail2ban logrotate rotate count and interval' - sedfile -i "s|rotate 4$|rotate ${LOGROTATE_COUNT}|" /etc/logrotate.d/fail2ban - sedfile -i "s|weekly$|${LOGROTATE_INTERVAL}|" /etc/logrotate.d/fail2ban + [[ ${LOGROTATE_COUNT} -ne 4 ]] && sedfile -i "s|rotate 4$|rotate ${LOGROTATE_COUNT}|" /etc/logrotate.d/fail2ban + [[ ${LOGROTATE_INTERVAL} != "weekly" ]] && sedfile -i "s|weekly$|${LOGROTATE_INTERVAL}|" /etc/logrotate.d/fail2ban } function __setup__security__amavis() { From 0c8d8f26d9323789569cab9ceac33e0b541380e0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 3 Mar 2024 22:50:06 +0100 Subject: [PATCH 2/2] docs: updated `CONTRIBUTORS.md` (#3916) --- CONTRIBUTORS.md | 356 +++++++++++++++++++++++++----------------------- 1 file changed, 182 insertions(+), 174 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c387a654..ffe5cecd 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -642,40 +642,19 @@ Thanks goes to these wonderful people ✨ yogo1212 - - - willtho89 -
- willtho89 - - - mpanneck
mpanneck - + + - - ubenmackin + + willtho89
- ubenmackin - - - - - craue -
- craue - - - - - abh -
- abh + willtho89 @@ -685,14 +664,20 @@ Thanks goes to these wonderful people ✨ andrewlow + + + abh +
+ abh + + aminvakil
aminvakil - - + elbracht @@ -700,6 +685,21 @@ Thanks goes to these wonderful people ✨ elbracht + + + craue +
+ craue + + + + + + ubenmackin +
+ ubenmackin + + danielpanteleit @@ -735,49 +735,6 @@ Thanks goes to these wonderful people ✨ emazzotta - - - - nueaf -
- nueaf - - - - - martinwepner -
- martinwepner - - - - - artonge -
- artonge - - - - - spacecowboy -
- spacecowboy - - - - - jedateach -
- jedateach - - - - - millaguie -
- millaguie - - @@ -793,6 +750,13 @@ Thanks goes to these wonderful people ✨ ipernet + + + H4R0 +
+ H4R0 + + eltociear @@ -808,60 +772,53 @@ Thanks goes to these wonderful people ✨ - - H4R0 + + millaguie
- H4R0 - - - - - nilshoell -
- nilshoell + millaguie - - simonsystem + + martinwepner
- simonsystem + martinwepner - - stephan-devop + + artonge
- stephan-devop + artonge - - stigok + + jedateach
- stigok + jedateach - - 5ven + + spacecowboy
- 5ven + spacecowboy - - syl20bnr + + nueaf
- syl20bnr + nueaf - - sylvaindumont + + thomasschmit
- sylvaindumont + thomasschmit @@ -873,10 +830,53 @@ Thanks goes to these wonderful people ✨ - - thomasschmit + + sylvaindumont
- thomasschmit + sylvaindumont + + + + + syl20bnr +
+ syl20bnr + + + + + 5ven +
+ 5ven + + + + + stigok +
+ stigok + + + + + stephan-devop +
+ stephan-devop + + + + + + simonsystem +
+ simonsystem + + + + + radicand +
+ radicand @@ -951,6 +951,13 @@ Thanks goes to these wonderful people ✨ + + + nilshoell +
+ nilshoell + + nknapp @@ -985,15 +992,15 @@ Thanks goes to these wonderful people ✨
mrPjer - + + p3dda
p3dda - - + peter-hartmann @@ -1015,13 +1022,6 @@ Thanks goes to these wonderful people ✨ rahilarious - - - 0xflotus -
- 0xflotus - - remoe @@ -1416,14 +1416,21 @@ Thanks goes to these wonderful people ✨ matrixes + + + 0xflotus +
+ 0xflotus + + + auchri
auchri - - + arkanovicz @@ -1458,15 +1465,15 @@ Thanks goes to these wonderful people ✨
dkarski - + + dbellavista
dbellavista - - + danielvandenberg95 @@ -1495,6 +1502,14 @@ Thanks goes to these wonderful people ✨ mazzz1y + + + doominator42 +
+ doominator42 + + + aydodo @@ -1508,8 +1523,7 @@ Thanks goes to these wonderful people ✨
vedtam - - + edvorg @@ -1537,7 +1551,8 @@ Thanks goes to these wonderful people ✨
ErikEngerd - + + huncode @@ -1551,8 +1566,7 @@ Thanks goes to these wonderful people ✨
felixn - - + flole @@ -1560,13 +1574,6 @@ Thanks goes to these wonderful people ✨ flole - - - froks -
- froks - - ifokeev @@ -1587,15 +1594,15 @@ Thanks goes to these wonderful people ✨
2b - + + askz
askz - - + aspettl @@ -1630,15 +1637,15 @@ Thanks goes to these wonderful people ✨
alexanderneu - + + ch3sh1r
ch3sh1r - - + eglia @@ -1673,15 +1680,15 @@ Thanks goes to these wonderful people ✨
MrFreezeex - + + arunvc
arunvc - - + astrocket @@ -1716,15 +1723,22 @@ Thanks goes to these wonderful people ✨
crash7 - - - - fkefer -
- fkefer - + + + froks +
+ froks + + + + + akkumar +
+ akkumar + + thechubbypanda @@ -1752,7 +1766,8 @@ Thanks goes to these wonderful people ✨
JustAnother1 - + + LeoWinterDE @@ -1766,8 +1781,7 @@ Thanks goes to these wonderful people ✨
linhandev - - + luke- @@ -1795,7 +1809,8 @@ Thanks goes to these wonderful people ✨
madmath03 - + + maxemann96 @@ -1809,8 +1824,7 @@ Thanks goes to these wonderful people ✨
dragetd - - + michaeljensen @@ -1838,7 +1852,8 @@ Thanks goes to these wonderful people ✨
mcchots - + + MohammedNoureldin @@ -1852,8 +1867,7 @@ Thanks goes to these wonderful people ✨
mpldr - - + naveensrinivasan @@ -1869,10 +1883,10 @@ Thanks goes to these wonderful people ✨ - - radicand + + fkefer
- radicand + fkefer @@ -1881,7 +1895,8 @@ Thanks goes to these wonderful people ✨
Marsu31 - + + glandais @@ -1895,8 +1910,7 @@ Thanks goes to these wonderful people ✨
GiovanH - - + harryyoud @@ -1924,7 +1938,8 @@ Thanks goes to these wonderful people ✨
Influencer - + + JacksonZ03 @@ -1938,8 +1953,7 @@ Thanks goes to these wonderful people ✨
JamBalaya56562 - - + jcalfee @@ -1967,7 +1981,8 @@ Thanks goes to these wonderful people ✨
Jeidnx - + + jessp01 @@ -1981,8 +1996,7 @@ Thanks goes to these wonderful people ✨
JiLleON - - + jirislav @@ -2010,20 +2024,14 @@ Thanks goes to these wonderful people ✨
JOduMonT - + + Kaan88
Kaan88 - - - - akkumar -
- akkumar -