1
0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-12 10:45:38 +02:00
Commit Graph

2067 Commits

Author SHA1 Message Date
bors-mailu[bot]
6b5bb5fcd1
Merge #3559
3559: Fix #3531 (backport #3557) r=mergify[bot] a=mergify[bot]

## What type of PR?

bug-fix

## What does this PR do?

Ensure we have both RSA and ECDSA certs when using letsencrypt now that the default behaviour from certbot has changed.
This is only important for new installs, not those renewing existing certs.

### Related issue(s)
- closes #3531

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
<hr>This is an automatic backport of pull request #3557 done by [Mergify](https://mergify.com).

Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2024-09-23 09:16:11 +00:00
Florent Daigniere
e47da4ba0d Fix #3531
(cherry picked from commit 8e4af5ad05)
2024-09-22 13:25:31 +00:00
Florent Daigniere
bd7a5bd235 Add delay
(cherry picked from commit c11815b3a0)
2024-09-13 07:29:26 +00:00
Florent Daigniere
6d2daebe68 Maybe fix #3402
(cherry picked from commit 8b34fbe881)
2024-09-13 07:29:25 +00:00
Florent Daigniere
4dc2e0b48a Need sleep.
(cherry picked from commit 07f0ec3d0b)
2024-09-12 21:26:07 +00:00
Florent Daigniere
e7caca3e08 As per review
(cherry picked from commit 12e94b7616)
2024-09-12 15:34:09 +00:00
Florent Daigniere
c193cf1d60 play it safe
(cherry picked from commit f4ab22edbc)
2024-09-12 15:34:09 +00:00
Florent Daigniere
0bdb9e1cea Apply suggestions from code review
Co-authored-by: Alexander Graf <ghostwheel42@users.noreply.github.com>
(cherry picked from commit cdf8ee8820)
2024-09-12 15:34:09 +00:00
Florent Daigniere
cb3ed1598d doh
(cherry picked from commit c6c4c09f08)
2024-09-12 15:34:09 +00:00
Florent Daigniere
80427fb77c Fix #3450
(cherry picked from commit a875d7fe6a)
2024-09-12 15:34:09 +00:00
Florent Daigniere
8e0809ebfe Fix #3411
(cherry picked from commit 63769c73cf)
2024-09-09 18:03:58 +00:00
Dimitri Huisman
883af43f7a Fix 3420 - fixed syntax errors in certwatcher.py
(cherry picked from commit c4f457e7f9)
2024-09-09 14:18:48 +00:00
Florent Daigniere
f5bc226574 INBOUND_TLS_ENFORCE makes no sense.
(cherry picked from commit 28c28b1c84)
2024-09-07 18:45:50 +00:00
Florent Daigniere
eb2754c211 doh
(cherry picked from commit 5ea3840fc4)
2024-09-07 18:45:50 +00:00
Florent Daigniere
0e9721b7f9 Untested code that may fix the following:
Exception in thread Thread-2 (forward_text_lines):
Traceback (most recent call last):
  File "/usr/lib/python3.12/threading.py", line 1073, in _bootstrap_inner
    self.run()  File "/usr/lib/python3.12/threading.py", line 1010, in run
    self._target(*self._args, **self._kwargs)
  File "/app/venv/lib/python3.12/site-packages/socrate/system.py", line 155, in forward_text_lines
    current_line = src.readline()
                   ^^^^^^^^^^^^^^
  File "<frozen codecs>", line 322, in decode
UnicodeDecodeError: 'utf-8' codec can't decode byte 0xa8 in position 166: invalid start byte

This was reported in #3398

(cherry picked from commit 61812ac32a)
2024-09-07 18:45:50 +00:00
Florent Daigniere
45c39d9416 fix #3379
(cherry picked from commit bae4855bea)
2024-09-07 18:45:50 +00:00
Florent Daigniere
a0cb9852ac doh
(cherry picked from commit b426c67949)
2024-09-07 18:45:50 +00:00
Florent Daigniere
8c6b0ccdb3 fix #3403
(cherry picked from commit e5790a297a)
2024-09-07 18:45:49 +00:00
Florent Daigniere
6fc97ee2cb doh2
(cherry picked from commit 1917bf7ee4)
2024-08-11 16:43:16 +00:00
Florent Daigniere
7556df2fa7 Fix CI
(cherry picked from commit 616376eb5a)
2024-08-11 16:43:16 +00:00
Florent Daigniere
b36018e0c1 Handle the case where PROXY_PROTOCOL_25 is set
(cherry picked from commit 0ff18c6079)
2024-08-11 16:43:16 +00:00
Florent Daigniere
79a393d601 s/nginx/front
(cherry picked from commit 5cfec650df)
2024-08-09 14:35:38 +00:00
Florent Daigniere
f2c0a147fa as per review
(cherry picked from commit 78c5d34227)
2024-08-09 14:35:38 +00:00
Florent Daigniere
14196e5054 Do the same with Client-Ip
(cherry picked from commit 98f671dc2e)
2024-08-09 14:35:37 +00:00
Florent Daigniere
1366ee3fc7 doh
(cherry picked from commit d7c6528f04)
2024-08-09 14:35:37 +00:00
Florent Daigniere
a5af42a6ef Better
(cherry picked from commit 38ea029bd9)
2024-08-09 14:35:37 +00:00
Florent Daigniere
00ef3cb950 Remove this insanity since we don't use nginx
(cherry picked from commit 148c8f9ede)
2024-08-09 14:35:37 +00:00
Florent Daigniere
3d4a9ac29c Fix #3364
(cherry picked from commit ee243ea735)
2024-08-09 14:35:37 +00:00
bors-mailu[bot]
30734b49aa
Merge #3363
3363: Update 3rd party deps (backport #3358) r=mergify[bot] a=mergify[bot]

## What type of PR?

bug-fix

## What does this PR do?

Update 3rd party deps (clamav & snappymail), clarify the wording in the docs related to rspamd overrides.

### Related issue(s)
- closes #3347 
- closes #3360 (thank you [ctrl-i](https://github.com/ctrl-i) for the heads up)
- #3359 

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
<hr>This is an automatic backport of pull request #3358 done by [Mergify](https://mergify.com).

Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
2024-08-06 16:44:54 +00:00
Florent Daigniere
dcd843d4ba Add a new CNAME for old MUAs
(cherry picked from commit cfec4c58cc)
2024-08-06 16:27:34 +00:00
Florent Daigniere
95edcd8dcb As per review
(cherry picked from commit 11e72e7034)
2024-07-30 11:08:52 +00:00
Florent Daigniere
ca6488e2ff as per review
(cherry picked from commit 0eafff00c1)
2024-07-30 11:08:52 +00:00
Florent Daigniere
6173f5e434 simplify again the logic
(cherry picked from commit f003c0e712)
2024-07-30 11:08:52 +00:00
Florent Daigniere
745d26acf5 Fix email forwarding when set from the UI
(cherry picked from commit 9120f731fc)
2024-07-30 11:08:52 +00:00
Florent Daigniere
9392c62664 Fix smtpd_forbid_unauth_pipelining w XCLIENT
(cherry picked from commit 648c98ab05)
2024-07-01 15:47:49 +00:00
Florent Daigniere
47b2cd4792 Update models.py
(cherry picked from commit 98b3016bbd)
2024-06-26 12:26:15 +00:00
Florent Daigniere
dc86008cb4 optimize as per review
(cherry picked from commit cdbfa4ee01)
2024-06-26 12:26:15 +00:00
Florent Daigniere
8e28050510 Don't let people disable 465 and 993
This is what we use for the other type of autoconfig... and really what
everyone should be using.

(cherry picked from commit 5fb44bd719)
2024-06-26 12:26:15 +00:00
Florent Daigniere
fd4ba4bd86 Update autoconfig too
(cherry picked from commit b3d49599cf)
2024-06-26 12:26:14 +00:00
Florent Daigniere
42b4dd2004 ports not in PORTS should not be bound
(cherry picked from commit b7dcf45267)
2024-06-26 12:26:14 +00:00
bors-mailu[bot]
8bd5d0f23d
Merge #3317 #3318
3317: define client_ip variable (backport #3315) r=mergify[bot] a=mergify[bot]

## What type of PR?

bug-fix

## What does this PR do?

### Related issue(s)
closes #3314 

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
<hr>This is an automatic backport of pull request #3315 done by [Mergify](https://mergify.com).

3318: nginx should recursively set the realip until the first no trusted ad… (backport #3313) r=mergify[bot] a=mergify[bot]

## What type of PR?

bug-fix

## What does this PR do?

### Related issue(s)

closes https://github.com/Mailu/Mailu/issues/3311

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [x] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
<hr>This is an automatic backport of pull request #3313 done by [Mergify](https://mergify.com).

Co-authored-by: Dominik Hebeler <dominik@suma-ev.de>
2024-06-26 11:38:07 +00:00
Dominik Hebeler
33516af243 do not put real_ip_recursive within the for-loop
(cherry picked from commit 5be25b5887)
2024-06-26 07:36:28 +00:00
Dominik Hebeler
c941950344 nginx should recursively set the realip until the first no trusted address is found
(cherry picked from commit 28f3b60615)
2024-06-26 07:36:28 +00:00
Dominik Hebeler
bca4fdffdb define client_ip variable
(cherry picked from commit 34766602a8)
2024-06-26 07:30:26 +00:00
Florent Daigniere
de922fd7e4 better
(cherry picked from commit 89ff26660f)
2024-06-19 17:00:57 +00:00
Florent Daigniere
2d2e9c4d8a another
(cherry picked from commit c0d0dcf713)
2024-06-19 17:00:57 +00:00
Florent Daigniere
600235f393 another one
nginx: [warn] the "listen ... http2" directive is deprecated, use the "http2" directive instead in /etc/nginx/nginx.conf:90
(cherry picked from commit e9db8c4509)
2024-06-19 17:00:57 +00:00
Florent Daigniere
a4542507b5 remove another warning
ERROR:root:Not sure what to do with  in PROXY_PROTOCOL (None)
(cherry picked from commit 12c1affc05)
2024-06-19 17:00:56 +00:00
Florent Daigniere
59bcf25b5b fix warnings
(cherry picked from commit 2b6daf6157)
2024-06-19 17:00:56 +00:00
Dimitri Huisman
415c55e73b
Update version numbers 2024-06-09 14:56:34 +00:00