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

Refactor domain handling in certbot-new.py to streamline input processing and ensure consistent lowercasing of server names

Browse source
This commit is contained in:
Théophile Diot 2024-12-24 13:52:23 +01:00
parent 4ca6bd53e8
commit eda8a10ce6
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/core/letsencrypt/jobs/certbot-new.py
View file

@ -175,7 +175,7 @@ try:
if not IS_MULTISITE:
use_letsencrypt = getenv("AUTO_LETS_ENCRYPT", "no") == "yes"
use_letsencrypt_dns = getenv("LETS_ENCRYPT_CHALLENGE", "http") == "dns"
domains_server_names = {servers[0]: servers}
domains_server_names = {servers[0]: " ".join(servers).lower()}
else:
domains_server_names = {}
@ -276,10 +276,7 @@ try:
first_server = wildcards[0].lstrip("*.")
domains = set(wildcards)
else:
if isinstance(domains, str):
domains = set(domains.split(" "))
else:
domains = set(domains)
domains = set(domains.split(" "))
certificate_block = None
for block in certificate_blocks:
@ -419,7 +416,7 @@ try:
+ ("the propagation time will be the provider's default and " if data["challenge"] == "dns" else "")
+ "the email will be the same as the first domain that created the group..."
)
WILDCARD_GENERATOR.extend(group, domains.split(" ") if isinstance(domains, str) else domains, data["email"], data["staging"])
WILDCARD_GENERATOR.extend(group, domains.split(" "), data["email"], data["staging"])
file_path = (f"{group}.{file_type}",)
# * Generating the credentials file