1
0
mirror of https://github.com/Mailu/Mailu.git synced 2025-03-03 14:52:36 +02:00

ghostwheel42's suggestions

This commit is contained in:
Florent Daigniere 2022-02-24 12:45:30 +01:00
parent ab35492589
commit f9869b1d79

View File

@ -38,17 +38,13 @@ def format_for_nginx(fullchain, output):
""" We may want to strip ISRG Root X1 out """
if not os.path.exists(fullchain):
return
certs = []
split = '-----END CERTIFICATE-----\n'
with open(fullchain, 'r') as pem:
cert = ''
for line in pem:
cert += line
if '-----END CERTIFICATE-----' in line:
certs += [cert]
cert = ''
certs = [f'{cert}{split}' for cert in pem.read().split(split) if cert]
if len(certs)>2 and os.getenv('LETSENCRYPT_SHORTCHAIN'):
del certs[-1]
with open(output, 'w') as pem:
for cert in certs[:-1] if len(certs)>2 and os.getenv('LETSENCRYPT_SHORTCHAIN', default="False") else certs:
pem.write(cert)
pem.write(''.join(certs))
if args['TLS_FLAVOR'] in ['letsencrypt', 'mail-letsencrypt']:
format_for_nginx('/certs/letsencrypt/live/mailu/fullchain.pem', '/certs/letsencrypt/live/mailu/nginx-chain.pem')