YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Always expect subdomain xmpp-upload.domain.net.

Browse source 
This subdomain will be part of Letsencrypt certificate so
it MUST be defined in DNS zone otherwise certificate renewal will fail.
This commit is contained in:
pitchum 2019-10-30 09:07:58 +01:00
parent e633c8351b
commit c6e8bb5d26
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/templates/ssl/openssl.cnf
View file

@ -192,7 +192,7 @@ authorityKeyIdentifier=keyid,issuer
basicConstraints = CA:FALSE basicConstraints = CA:FALSE
keyUsage = nonRepudiation, digitalSignature, keyEncipherment keyUsage = nonRepudiation, digitalSignature, keyEncipherment
subjectAltName=DNS:yunohost.org,DNS:www.yunohost.org,DNS:ns.yunohost.org subjectAltName=DNS:yunohost.org,DNS:www.yunohost.org,DNS:ns.yunohost.org,DNS:xmpp-upload.yunohost.org
[ v3_ca ] [ v3_ca ]

3
src/yunohost/certificate.py
View file

@ -639,6 +639,9 @@ def _prepare_certificate_signing_request(domain, key_file, output_folder):
# Set the domain # Set the domain
csr.get_subject().CN = domain csr.get_subject().CN = domain
# Include xmpp-upload subdomain as subject alternate names
csr.add_extensions([crypto.X509Extension("subjectAltName", False, "DNS:xmpp-upload." + domain)])
# Set the key # Set the key
with open(key_file, 'rt') as f: with open(key_file, 'rt') as f:
key = crypto.load_privatekey(crypto.FILETYPE_PEM, f.read()) key = crypto.load_privatekey(crypto.FILETYPE_PEM, f.read())

2
src/yunohost/domain.py
View file

@ -412,6 +412,7 @@ def _build_dns_conf(domain, ttl=3600):
{"type": "CNAME", "name": "muc", "value": "@", "ttl": 3600}, {"type": "CNAME", "name": "muc", "value": "@", "ttl": 3600},
{"type": "CNAME", "name": "pubsub", "value": "@", "ttl": 3600}, {"type": "CNAME", "name": "pubsub", "value": "@", "ttl": 3600},
{"type": "CNAME", "name": "vjud", "value": "@", "ttl": 3600} {"type": "CNAME", "name": "vjud", "value": "@", "ttl": 3600}
{"type": "CNAME", "name": "xmpp-upload", "value": "@", "ttl": 3600}
], ],
"mail": [ "mail": [
{"type": "MX", "name": "@", "value": "10 domain.tld.", "ttl": 3600}, {"type": "MX", "name": "@", "value": "10 domain.tld.", "ttl": 3600},
@ -453,6 +454,7 @@ def _build_dns_conf(domain, ttl=3600):
["muc", ttl, "CNAME", "@"], ["muc", ttl, "CNAME", "@"],
["pubsub", ttl, "CNAME", "@"], ["pubsub", ttl, "CNAME", "@"],
["vjud", ttl, "CNAME", "@"], ["vjud", ttl, "CNAME", "@"],
["xmpp-upload", ttl, "CNAME", "@"],
] ]
# SPF record # SPF record