diff --git a/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl b/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl index a281371..e2b3d78 100644 --- a/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl +++ b/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl @@ -17,8 +17,8 @@ server { ssl_certificate %tls_cert_file; ssl_certificate_key %tls_key_file; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:ECDHE-RSA-AES128-GCM-SHA256:AES256+EECDH:DHE-RSA-AES128-GCM-SHA256:AES256+EDH:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; + ssl_protocols TLSv1.2 TLSv1.3; + ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384"; ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; ssl_verify_depth 3; diff --git a/modoboa_installer/ssl.py b/modoboa_installer/ssl.py index 784e9d1..8df9b30 100644 --- a/modoboa_installer/ssl.py +++ b/modoboa_installer/ssl.py @@ -104,7 +104,7 @@ class LetsEncryptCertificate(CertificateBackend): self.hostname, self.config.get("letsencrypt", "email"))) with open("/etc/cron.d/letsencrypt", "w") as fp: fp.write("0 */12 * * * root certbot renew " - "--quiet --no-self-upgrade --force-renewal\n") + "--quiet\n") cfg_file = "/etc/letsencrypt/renewal/{}.conf".format(self.hostname) pattern = "s/authenticator = standalone/authenticator = nginx/" utils.exec_cmd("perl -pi -e '{}' {}".format(pattern, cfg_file))