Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move MX record to its own subdomain #403

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move MX record to its own subdomain #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/staging-ipv4.testrun.org-default.zone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ $TTL 300
mta-sts.staging-ipv4.testrun.org. CNAME staging-ipv4.testrun.org.
iroh.staging-ipv4.testrun.org. CNAME staging-ipv4.testrun.org.
www.staging-ipv4.testrun.org. CNAME staging-ipv4.testrun.org.
mx.staging-ipv4.testrun.org. CNAME staging-ipv4.testrun.org.
1 change: 1 addition & 0 deletions .github/workflows/staging.testrun.org-default.zone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ $TTL 300
mta-sts.staging2.testrun.org. CNAME staging2.testrun.org.
iroh.staging2.testrun.org. CNAME staging2.testrun.org.
www.staging2.testrun.org. CNAME staging2.testrun.org.
mx.staging2.testrun.org. CNAME staging2.testrun.org.

2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
- fix Dovecot quota_max_mail_size to use max_message_size config value
([#438](https://github.com/deltachat/chatmail/pull/438))

- Move MX record to its own subdomain
([#403](https://github.com/deltachat/chatmail/pull/403))

## 1.4.1 2024-07-31

Expand Down
7 changes: 6 additions & 1 deletion cmdeploy/src/cmdeploy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,12 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
deploy_iroh_relay(config)

# Deploy acmetool to have TLS certificates.
tls_domains = [mail_domain, f"mta-sts.{mail_domain}", f"www.{mail_domain}"]
tls_domains = [
mail_domain,
f"mta-sts.{mail_domain}",
f"www.{mail_domain}",
f"mx.{mail_domain}",
]
deploy_acmetool(
domains=tls_domains,
)
Expand Down
3 changes: 2 additions & 1 deletion cmdeploy/src/cmdeploy/chatmail.zone.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
{% if AAAA %}
{{ mail_domain }}. AAAA {{ AAAA }}
{% endif %}
{{ mail_domain }}. MX 10 {{ mail_domain }}.
{{ mail_domain }}. MX 10 mx.{{ mail_domain }}.
_mta-sts.{{ mail_domain }}. TXT "v=STSv1; id={{ sts_id }}"
mta-sts.{{ mail_domain }}. CNAME {{ mail_domain }}.
www.{{ mail_domain }}. CNAME {{ mail_domain }}.
mx.{{ mail_domain }}. CNAME {{ mail_domain }}.
{{ dkim_entry }}

;
Expand Down
2 changes: 1 addition & 1 deletion cmdeploy/src/cmdeploy/nginx/mta-sts.txt.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: STSv1
mode: enforce
mx: {{ config.domain_name }}
mx: mx.{{ config.domain_name }}
max_age: 2419200