scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-29 17:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix letsencrypt access to certbot for the mail-letsencrypt flavour

Browse Source 
(cherry picked from commit d32e73c5bc)

# Conflicts:
#	core/nginx/conf/nginx.conf
This commit is contained in:
ofthesun9
2020-11-17 10:26:41 +01:00
committed by Mergify
parent 6b5bb5fcd1
commit 1aaf24c9ad
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/nginx/conf/nginx.conf
View File

@@ -171,7 +171,11 @@ http {
{% endif %}
# If TLS is failing, prevent access to anything except certbot
<<<<<<< HEAD
{% if TLS_ERROR and not (TLS_FLAVOR in [ 'mail-letsencrypt', 'mail' ]) %}
=======
{% if KUBERNETES_INGRESS != 'true' and TLS_ERROR and not (TLS_FLAVOR in [ 'mail-letsencrypt', 'mail' ]) %}
>>>>>>> d32e73c5 (Fix letsencrypt access to certbot for the mail-letsencrypt flavour)
location / {
return 403;
}

1
towncrier/newsfragments/1686.bugfix Normal file
View File

@@ -0,0 +1 @@
Fix letsencrypt access to certbot for the mail-letsencrypt flavour