[ACME] Skip autodiscover/mta-sts subdomains covered by wildcard certificates#7134
Merged
FreddleSpl0it merged 1 commit intostagingfrom Mar 13, 2026
Merged
[ACME] Skip autodiscover/mta-sts subdomains covered by wildcard certificates#7134FreddleSpl0it merged 1 commit intostagingfrom
FreddleSpl0it merged 1 commit intostagingfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contribution Guidelines
What does this PR include?
Short Description
This PR extends the wildcard certificate fix from PR #7124 to all auto-generated subdomains (autodiscover, autoconfig, mta-sts).
Problem: When
ADDITIONAL_SANcontains a wildcard certificate (e.g.,*.example.com) andAUTODISCOVER_SAN=y, mailcow automatically addsautodiscover.example.com,autoconfig.example.com, andmta-sts.example.comto the certificate request. These are redundant with the wildcard and Let's Encrypt rejects the request with: "Domain name 'X' is redundant with a wildcard domain".Solution: Before adding these subdomains to the certificate request, check if they are already covered by a wildcard in
ADDITIONAL_SAN. If yes, skip them.Related:
Affected Containers