Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 01:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Accept incoming changes for misc jobs

Browse source
This commit is contained in:
Théophile Diot 2023-02-22 10:56:45 +01:00
parent c5a10aaa3c
commit 596258559c
No known key found for this signature in database
GPG key ID: E752C80DB72BB014
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/core/misc/jobs/default-server-cert.py
View file

@ -24,13 +24,8 @@ try:
need_default_cert = False
if getenv("MULTISITE", "no") == "yes":
for first_server in getenv("SERVER_NAME", "").split(" "):
<<<<<<< HEAD
for check_var in [
"USE_CUSTOM_SSL",
=======
for check_var in (
"USE_CUSTOM_HTTPS",
>>>>>>> 6bf59b59a25691c6c6dbafc4ffb3051bc1519f34
"USE_CUSTOM_SSL",
"AUTO_LETS_ENCRYPT",
"GENERATE_SELF_SIGNED_SSL",
):