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

Merge branch 'master' into backup

Browse Source
This commit is contained in:
Spitap
2022-07-25 22:10:26 +02:00
parent 20970557de d495afd4c2
commit 26204143af
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modoboa_installer/scripts/files/nginx/modoboa.conf.tpl
View File

@@ -17,8 +17,8 @@ server {
ssl_certificate %tls_cert_file; ssl_certificate %tls_cert_file;
ssl_certificate_key %tls_key_file; ssl_certificate_key %tls_key_file;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_protocols TLSv1.2 TLSv1.3;
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_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_prefer_server_ciphers on;
ssl_session_cache shared:SSL:10m; ssl_session_cache shared:SSL:10m;
ssl_verify_depth 3; ssl_verify_depth 3;

2
modoboa_installer/ssl.py
View File

@@ -104,7 +104,7 @@ class LetsEncryptCertificate(CertificateBackend):
self.hostname, self.config.get("letsencrypt", "email"))) self.hostname, self.config.get("letsencrypt", "email")))
with open("/etc/cron.d/letsencrypt", "w") as fp: with open("/etc/cron.d/letsencrypt", "w") as fp:
fp.write("0 */12 * * * root certbot renew " 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) cfg_file = "/etc/letsencrypt/renewal/{}.conf".format(self.hostname)
pattern = "s/authenticator = standalone/authenticator = nginx/" pattern = "s/authenticator = standalone/authenticator = nginx/"
utils.exec_cmd("perl -pi -e '{}' {}".format(pattern, cfg_file)) utils.exec_cmd("perl -pi -e '{}' {}".format(pattern, cfg_file))