Merge branch 'master' into rename-supervisor-conf
This commit is contained in:
commit
88e7cdae44
|
@ -45,7 +45,7 @@ jobs:
|
|||
# but presently does not work correctly via split workflow. It is useful in a split workflow as the 1st stage
|
||||
# no longer indicates if the entire workflow/deployment was successful.
|
||||
- name: 'Commit Status: Set Workflow Status as Pending'
|
||||
uses: myrotvorets/set-commit-status-action@v2.0.0
|
||||
uses: myrotvorets/set-commit-status-action@v2.0.1
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
status: pending
|
||||
|
@ -105,7 +105,7 @@ jobs:
|
|||
Built with commit: ${{ env.PR_HEADSHA }}
|
||||
|
||||
- name: 'Commit Status: Update deployment status'
|
||||
uses: myrotvorets/set-commit-status-action@v2.0.0
|
||||
uses: myrotvorets/set-commit-status-action@v2.0.1
|
||||
# Always run this step regardless of job failing early:
|
||||
if: ${{ always() }}
|
||||
env:
|
||||
|
|
|
@ -60,6 +60,11 @@ The most noteworthy change of this release is the update of the container's base
|
|||
- `undef` was previously supported as an opt-out with `SA_SPAM_SUBJECT`. This is no longer valid, the equivalent opt-out value is now an empty value (_or rather the omission of this ENV being configured_).
|
||||
- The feature to include [`_SCORE_` tag](https://spamassassin.apache.org/full/4.0.x/doc/Mail_SpamAssassin_Conf.html#rewrite_header-subject-from-to-STRING) in your value to be replaced by the associated spam score is no longer available.
|
||||
|
||||
### Added
|
||||
|
||||
- **Environment Variables:**
|
||||
- `LOGROTATE_COUNT` defines the number of files kept by logrotate ([#3907](https://github.com/docker-mailserver/docker-mailserver/pull/3907))
|
||||
|
||||
### Updates
|
||||
|
||||
- **Environment Variables:**
|
||||
|
|
239
CONTRIBUTORS.md
239
CONTRIBUTORS.md
|
@ -291,28 +291,21 @@ Thanks goes to these wonderful people ✨
|
|||
<sub><b>pyy</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/dennis95stumm">
|
||||
<img src="https://avatars.githubusercontent.com/u/6422711?v=4" width="100;" alt="dennis95stumm"/>
|
||||
<br />
|
||||
<sub><b>dennis95stumm</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/arneke">
|
||||
<img src="https://avatars.githubusercontent.com/u/425235?v=4" width="100;" alt="arneke"/>
|
||||
<br />
|
||||
<sub><b>arneke</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/akmet">
|
||||
<img src="https://avatars.githubusercontent.com/u/10135260?v=4" width="100;" alt="akmet"/>
|
||||
<br />
|
||||
<sub><b>akmet</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/diiigle">
|
||||
<img src="https://avatars.githubusercontent.com/u/5210911?v=4" width="100;" alt="diiigle"/>
|
||||
|
@ -347,15 +340,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>lukecyca</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/jsonn">
|
||||
<img src="https://avatars.githubusercontent.com/u/296817?v=4" width="100;" alt="jsonn"/>
|
||||
<br />
|
||||
<sub><b>jsonn</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/jamebus">
|
||||
<img src="https://avatars.githubusercontent.com/u/573734?v=4" width="100;" alt="jamebus"/>
|
||||
|
@ -363,13 +356,6 @@ Thanks goes to these wonderful people ✨
|
|||
<sub><b>jamebus</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/dashohoxha">
|
||||
<img src="https://avatars.githubusercontent.com/u/1495805?v=4" width="100;" alt="dashohoxha"/>
|
||||
<br />
|
||||
<sub><b>dashohoxha</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/mathuin">
|
||||
<img src="https://avatars.githubusercontent.com/u/221823?v=4" width="100;" alt="mathuin"/>
|
||||
|
@ -377,6 +363,13 @@ Thanks goes to these wonderful people ✨
|
|||
<sub><b>mathuin</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/dashohoxha">
|
||||
<img src="https://avatars.githubusercontent.com/u/1495805?v=4" width="100;" alt="dashohoxha"/>
|
||||
<br />
|
||||
<sub><b>dashohoxha</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/egavard">
|
||||
<img src="https://avatars.githubusercontent.com/u/7823622?v=4" width="100;" alt="egavard"/>
|
||||
|
@ -390,15 +383,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>weo</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/Zehir">
|
||||
<img src="https://avatars.githubusercontent.com/u/845225?v=4" width="100;" alt="Zehir"/>
|
||||
<br />
|
||||
<sub><b>Zehir</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/guardiande">
|
||||
<img src="https://avatars.githubusercontent.com/u/4947715?v=4" width="100;" alt="guardiande"/>
|
||||
|
@ -433,15 +426,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>VanVan</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/mjung">
|
||||
<img src="https://avatars.githubusercontent.com/u/1105431?v=4" width="100;" alt="mjung"/>
|
||||
<br />
|
||||
<sub><b>mjung</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/m-schmoock">
|
||||
<img src="https://avatars.githubusercontent.com/u/4090425?v=4" width="100;" alt="m-schmoock"/>
|
||||
|
@ -476,15 +469,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>Starbix</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/citec">
|
||||
<img src="https://avatars.githubusercontent.com/u/4775008?v=4" width="100;" alt="citec"/>
|
||||
<br />
|
||||
<sub><b>citec</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/yajo">
|
||||
<img src="https://avatars.githubusercontent.com/u/973709?v=4" width="100;" alt="yajo"/>
|
||||
|
@ -519,15 +512,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>MakerMatrix</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/pbek">
|
||||
<img src="https://avatars.githubusercontent.com/u/1798101?v=4" width="100;" alt="pbek"/>
|
||||
<br />
|
||||
<sub><b>pbek</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/keslerm">
|
||||
<img src="https://avatars.githubusercontent.com/u/3018310?v=4" width="100;" alt="keslerm"/>
|
||||
|
@ -562,15 +555,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>bobbravo2</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/r-pufky">
|
||||
<img src="https://avatars.githubusercontent.com/u/4778046?v=4" width="100;" alt="r-pufky"/>
|
||||
<br />
|
||||
<sub><b>r-pufky</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/vincentDcmps">
|
||||
<img src="https://avatars.githubusercontent.com/u/29679418?v=4" width="100;" alt="vincentDcmps"/>
|
||||
|
@ -605,15 +598,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>j-marz</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/lokipo">
|
||||
<img src="https://avatars.githubusercontent.com/u/3238509?v=4" width="100;" alt="lokipo"/>
|
||||
<br />
|
||||
<sub><b>lokipo</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/msheakoski">
|
||||
<img src="https://avatars.githubusercontent.com/u/4156?v=4" width="100;" alt="msheakoski"/>
|
||||
|
@ -648,15 +641,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>yogo1212</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/willtho89">
|
||||
<img src="https://avatars.githubusercontent.com/u/4933503?v=4" width="100;" alt="willtho89"/>
|
||||
<br />
|
||||
<sub><b>willtho89</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/mpanneck">
|
||||
<img src="https://avatars.githubusercontent.com/u/37032012?v=4" width="100;" alt="mpanneck"/>
|
||||
|
@ -691,15 +684,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>andrewlow</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/aminvakil">
|
||||
<img src="https://avatars.githubusercontent.com/u/12948692?v=4" width="100;" alt="aminvakil"/>
|
||||
<br />
|
||||
<sub><b>aminvakil</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/elbracht">
|
||||
<img src="https://avatars.githubusercontent.com/u/2912000?v=4" width="100;" alt="elbracht"/>
|
||||
|
@ -734,15 +727,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>DuncanvR</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/emazzotta">
|
||||
<img src="https://avatars.githubusercontent.com/u/3884632?v=4" width="100;" alt="emazzotta"/>
|
||||
<br />
|
||||
<sub><b>emazzotta</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/nueaf">
|
||||
<img src="https://avatars.githubusercontent.com/u/3942111?v=4" width="100;" alt="nueaf"/>
|
||||
|
@ -777,34 +770,20 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>jedateach</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/millaguie">
|
||||
<img src="https://avatars.githubusercontent.com/u/10820281?v=4" width="100;" alt="millaguie"/>
|
||||
<br />
|
||||
<sub><b>millaguie</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/eltociear">
|
||||
<img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="100;" alt="eltociear"/>
|
||||
<a href="https://github.com/fl42">
|
||||
<img src="https://avatars.githubusercontent.com/u/46161216?v=4" width="100;" alt="fl42"/>
|
||||
<br />
|
||||
<sub><b>eltociear</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/H4R0">
|
||||
<img src="https://avatars.githubusercontent.com/u/8709669?v=4" width="100;" alt="H4R0"/>
|
||||
<br />
|
||||
<sub><b>H4R0</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/jamesfryer">
|
||||
<img src="https://avatars.githubusercontent.com/u/2470760?v=4" width="100;" alt="jamesfryer"/>
|
||||
<br />
|
||||
<sub><b>jamesfryer</b></sub>
|
||||
<sub><b>fl42</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
|
@ -815,10 +794,31 @@ Thanks goes to these wonderful people ✨
|
|||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/fl42">
|
||||
<img src="https://avatars.githubusercontent.com/u/46161216?v=4" width="100;" alt="fl42"/>
|
||||
<a href="https://github.com/eltociear">
|
||||
<img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="100;" alt="eltociear"/>
|
||||
<br />
|
||||
<sub><b>fl42</b></sub>
|
||||
<sub><b>eltociear</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/jamesfryer">
|
||||
<img src="https://avatars.githubusercontent.com/u/2470760?v=4" width="100;" alt="jamesfryer"/>
|
||||
<br />
|
||||
<sub><b>jamesfryer</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/H4R0">
|
||||
<img src="https://avatars.githubusercontent.com/u/8709669?v=4" width="100;" alt="H4R0"/>
|
||||
<br />
|
||||
<sub><b>H4R0</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/nilshoell">
|
||||
<img src="https://avatars.githubusercontent.com/u/33981934?v=4" width="100;" alt="nilshoell"/>
|
||||
<br />
|
||||
<sub><b>nilshoell</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
|
@ -872,13 +872,6 @@ Thanks goes to these wonderful people ✨
|
|||
<sub><b>TechnicLab</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/ShiriNmi1520">
|
||||
<img src="https://avatars.githubusercontent.com/u/33322926?v=4" width="100;" alt="ShiriNmi1520"/>
|
||||
<br />
|
||||
<sub><b>ShiriNmi1520</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/thomasschmit">
|
||||
<img src="https://avatars.githubusercontent.com/u/6014433?v=4" width="100;" alt="thomasschmit"/>
|
||||
|
@ -893,21 +886,13 @@ Thanks goes to these wonderful people ✨
|
|||
<sub><b>Thiritin</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/42wim">
|
||||
<img src="https://avatars.githubusercontent.com/u/1810977?v=4" width="100;" alt="42wim"/>
|
||||
<br />
|
||||
<sub><b>42wim</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/tweibert">
|
||||
<img src="https://avatars.githubusercontent.com/u/2368685?v=4" width="100;" alt="tweibert"/>
|
||||
<br />
|
||||
<sub><b>tweibert</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/torus">
|
||||
<img src="https://avatars.githubusercontent.com/u/65044?v=4" width="100;" alt="torus"/>
|
||||
|
@ -921,7 +906,8 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>VictorKoenders</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/Twist235">
|
||||
<img src="https://avatars.githubusercontent.com/u/98449070?v=4" width="100;" alt="Twist235"/>
|
||||
|
@ -949,15 +935,22 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>vilisas</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/nilshoell">
|
||||
<img src="https://avatars.githubusercontent.com/u/33981934?v=4" width="100;" alt="nilshoell"/>
|
||||
<a href="https://github.com/42wim">
|
||||
<img src="https://avatars.githubusercontent.com/u/1810977?v=4" width="100;" alt="42wim"/>
|
||||
<br />
|
||||
<sub><b>nilshoell</b></sub>
|
||||
<sub><b>42wim</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/ShiriNmi1520">
|
||||
<img src="https://avatars.githubusercontent.com/u/33322926?v=4" width="100;" alt="ShiriNmi1520"/>
|
||||
<br />
|
||||
<sub><b>ShiriNmi1520</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/nknapp">
|
||||
<img src="https://avatars.githubusercontent.com/u/636150?v=4" width="100;" alt="nknapp"/>
|
||||
|
@ -992,15 +985,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>mrPjer</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/p3dda">
|
||||
<img src="https://avatars.githubusercontent.com/u/2871413?v=4" width="100;" alt="p3dda"/>
|
||||
<br />
|
||||
<sub><b>p3dda</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/peter-hartmann">
|
||||
<img src="https://avatars.githubusercontent.com/u/20216585?v=4" width="100;" alt="peter-hartmann"/>
|
||||
|
@ -1035,6 +1028,13 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>remoe</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/robbertkl">
|
||||
<img src="https://avatars.githubusercontent.com/u/5704510?v=4" width="100;" alt="robbertkl"/>
|
||||
<br />
|
||||
<sub><b>robbertkl</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
|
@ -1717,14 +1717,21 @@ Thanks goes to these wonderful people ✨
|
|||
<sub><b>crash7</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/fkefer">
|
||||
<img src="https://avatars.githubusercontent.com/u/1140674?v=4" width="100;" alt="fkefer"/>
|
||||
<br />
|
||||
<sub><b>fkefer</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/thechubbypanda">
|
||||
<img src="https://avatars.githubusercontent.com/u/33595996?v=4" width="100;" alt="thechubbypanda"/>
|
||||
<br />
|
||||
<sub><b>thechubbypanda</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/KCrawley">
|
||||
<img src="https://avatars.githubusercontent.com/u/60195478?v=4" width="100;" alt="KCrawley"/>
|
||||
|
@ -1759,15 +1766,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>linhandev</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/luke-">
|
||||
<img src="https://avatars.githubusercontent.com/u/4736168?v=4" width="100;" alt="luke-"/>
|
||||
<br />
|
||||
<sub><b>luke-</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/LucidityCrash">
|
||||
<img src="https://avatars.githubusercontent.com/u/49124523?v=4" width="100;" alt="LucidityCrash"/>
|
||||
|
@ -1802,15 +1809,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>dragetd</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/michaeljensen">
|
||||
<img src="https://avatars.githubusercontent.com/u/3026633?v=4" width="100;" alt="michaeljensen"/>
|
||||
<br />
|
||||
<sub><b>michaeljensen</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/exhuma">
|
||||
<img src="https://avatars.githubusercontent.com/u/65717?v=4" width="100;" alt="exhuma"/>
|
||||
|
@ -1845,15 +1852,15 @@ Thanks goes to these wonderful people ✨
|
|||
<br />
|
||||
<sub><b>mpldr</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/naveensrinivasan">
|
||||
<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="100;" alt="naveensrinivasan"/>
|
||||
<br />
|
||||
<sub><b>naveensrinivasan</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/neuralp">
|
||||
<img src="https://avatars.githubusercontent.com/u/19252586?v=4" width="100;" alt="neuralp"/>
|
||||
|
@ -1868,13 +1875,6 @@ Thanks goes to these wonderful people ✨
|
|||
<sub><b>radicand</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/fkefer">
|
||||
<img src="https://avatars.githubusercontent.com/u/1140674?v=4" width="100;" alt="fkefer"/>
|
||||
<br />
|
||||
<sub><b>fkefer</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/Marsu31">
|
||||
<img src="https://avatars.githubusercontent.com/u/16478866?v=4" width="100;" alt="Marsu31"/>
|
||||
|
@ -1968,21 +1968,28 @@ Thanks goes to these wonderful people ✨
|
|||
<sub><b>Jeidnx</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/jessp01">
|
||||
<img src="https://avatars.githubusercontent.com/u/5270205?v=4" width="100;" alt="jessp01"/>
|
||||
<br />
|
||||
<sub><b>jessp01</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/JiLleON">
|
||||
<img src="https://avatars.githubusercontent.com/u/28780165?v=4" width="100;" alt="JiLleON"/>
|
||||
<br />
|
||||
<sub><b>JiLleON</b></sub>
|
||||
</a>
|
||||
</td>
|
||||
</td></tr>
|
||||
<tr>
|
||||
<td align="center">
|
||||
<a href="https://github.com/jirislav">
|
||||
<img src="https://avatars.githubusercontent.com/u/7583416?v=4" width="100;" alt="jirislav"/>
|
||||
<br />
|
||||
<sub><b>jirislav</b></sub>
|
||||
</a>
|
||||
</td></tr>
|
||||
<tr>
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="https://github.com/jmccl">
|
||||
<img src="https://avatars.githubusercontent.com/u/5283750?v=4" width="100;" alt="jmccl"/>
|
||||
|
|
|
@ -545,6 +545,12 @@ Changes the interval in which log files are rotated.
|
|||
|
||||
This variable can also determine the interval for Postfix's log summary reports, see [`PFLOGSUMM_TRIGGER`](#pflogsumm_trigger).
|
||||
|
||||
##### LOGROTATE_COUNT
|
||||
|
||||
Defines how many files are kept by logrotate.
|
||||
|
||||
- **4** => Number of files
|
||||
|
||||
#### SpamAssassin
|
||||
|
||||
##### ENABLE_SPAMASSASSIN
|
||||
|
|
|
@ -346,6 +346,9 @@ REPORT_SENDER=
|
|||
# Note: This variable can also determine the interval for Postfix's log summary reports, see [`PFLOGSUMM_TRIGGER`](#pflogsumm_trigger).
|
||||
LOGROTATE_INTERVAL=weekly
|
||||
|
||||
# Defines how many log files are kept by logrorate
|
||||
LOGROTATE_COUNT=4
|
||||
|
||||
|
||||
# If enabled, employs `reject_unknown_client_hostname` to sender restrictions in Postfix's configuration.
|
||||
#
|
||||
|
|
|
@ -19,13 +19,19 @@ function _setup_logrotate() {
|
|||
_dms_panic__invalid_value 'LOGROTATE_INTERVAL' 'Setup -> Logrotate'
|
||||
fi
|
||||
|
||||
if [[ ${LOGROTATE_COUNT} =~ ^[0-9]+$ ]]; then
|
||||
_log 'trace' "Logrotate count set to ${LOGROTATE_COUNT}"
|
||||
else
|
||||
_dms_panic__invalid_value 'LOGROTATE_COUNT' 'Setup -> Logrotate'
|
||||
fi
|
||||
|
||||
cat >/etc/logrotate.d/maillog << EOF
|
||||
/var/log/mail/mail.log
|
||||
{
|
||||
compress
|
||||
copytruncate
|
||||
delaycompress
|
||||
rotate 4
|
||||
rotate ${LOGROTATE_COUNT}
|
||||
${LOGROTATE_INTERVAL}
|
||||
}
|
||||
EOF
|
||||
|
|
|
@ -109,7 +109,7 @@ function __rspamd__setup_logfile() {
|
|||
compress
|
||||
copytruncate
|
||||
delaycompress
|
||||
rotate 4
|
||||
rotate ${LOGROTATE_COUNT}
|
||||
${LOGROTATE_INTERVAL}
|
||||
}
|
||||
EOF
|
||||
|
|
|
@ -145,6 +145,7 @@ function __environment_variables_general_setup() {
|
|||
VARS[GETMAIL_POLL]="${GETMAIL_POLL:=5}"
|
||||
VARS[LOG_LEVEL]="${LOG_LEVEL:=info}"
|
||||
VARS[LOGROTATE_INTERVAL]="${LOGROTATE_INTERVAL:=weekly}"
|
||||
VARS[LOGROTATE_COUNT]="${LOGROTATE_COUNT:=4}"
|
||||
VARS[LOGWATCH_INTERVAL]="${LOGWATCH_INTERVAL:=none}"
|
||||
VARS[LOGWATCH_RECIPIENT]="${LOGWATCH_RECIPIENT:=${REPORT_RECIPIENT}}"
|
||||
VARS[LOGWATCH_SENDER]="${LOGWATCH_SENDER:=${REPORT_SENDER}}"
|
||||
|
|
Loading…
Reference in New Issue