evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert generate removing

Browse Source
This commit is contained in:
Spitap
2023-06-21 21:10:50 +02:00
committed by Antoine Nguyen
parent 4759146d99
commit e900e6258f
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modoboa_installer/config_dict_template.py
View File

@@ -30,6 +30,10 @@ ConfigDictTemplate = [
{ {
"name": "certificate", "name": "certificate",
"values": [ "values": [
{
"option": "generate",
"default": "true",
},
{ {
"option": "type", "option": "type",
"default": "self-signed", "default": "self-signed",

4
modoboa_installer/ssl.py
View File

@@ -148,6 +148,10 @@ class LetsEncryptCertificate(CertificateBackend):
def get_backend(config): def get_backend(config):
"""Return the appropriate backend.""" """Return the appropriate backend."""
cert_type = config.get("certificate", "type") cert_type = config.get("certificate", "type")
condition = (not config.getboolean("certificate", "generate") and
cert_type != "manual")
if condition:
return None
if cert_type == "letsencrypt": if cert_type == "letsencrypt":
return LetsEncryptCertificate(config) return LetsEncryptCertificate(config)
if cert_type == "manual": if cert_type == "manual":