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

Aaaaand try again to fix certificate generation

Browse source
This commit is contained in:
Alexandre Aubin 2021-11-30 23:25:25 +01:00
parent 76075909c9
commit 34b7e667a7
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hooks/conf_regen/02-ssl
View file

@ -110,6 +110,9 @@ do_post_regen() {
then
mv /usr/share/yunohost/yunohost-config/ssl/yunoCA/* ${ssl_dir}
rm -rf /usr/share/yunohost/yunohost-config
# Overwrite openssl.cnf because it may still contain references to the old yunoCA dir
rm -f ${ssl_dir}/openssl.ca.cnf
install -D -m 644 ${template_dir}/openssl.cnf "${ssl_dir}/openssl.cnf"
fi
mkdir -p ${ssl_dir}/{ca,certs,crl,newcerts}

12
src/certificate.py
View file

@ -143,11 +143,7 @@ def _certificate_install_selfsigned(domain_list, force=False):
# Paths of files and folder we'll need
date_tag = datetime.utcnow().strftime("%Y%m%d.%H%M%S")
new_cert_folder = "%s/%s-history/%s-selfsigned" % (
CERT_FOLDER,
domain,
date_tag,
)
new_cert_folder = f"{CERT_FOLDER}/{domain}-history/{date_tag}-selfsigned"
conf_template = os.path.join(SSL_DIR, "openssl.cnf")
@ -181,10 +177,8 @@ def _certificate_install_selfsigned(domain_list, force=False):
# Use OpenSSL command line to create a certificate signing request,
# and self-sign the cert
commands = [
"openssl req -new -config %s -out %s -keyout %s -nodes -batch"
% (conf_file, csr_file, key_file),
"openssl ca -config %s -days 3650 -in %s -out %s -batch"
% (conf_file, csr_file, crt_file),
f"openssl req -new -config {conf_file} -out {csr_file} -keyout {key_file} -nodes -batch",
f"openssl ca -config {conf_file} -days 3650 -in {csr_file} -out {crt_file} -batch",
]
for command in commands: