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

autodiscover config mods

Browse Source 
Add https to
This commit is contained in:
stefaweb
2018-07-01 09:00:25 +02:00
parent 5acc2f81a3
commit 6e876be34b
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modoboa_installer/scripts/files/nginx/automx.conf.tpl
View File

@@ -6,6 +6,7 @@ server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name %hostname; server_name %hostname;
root /srv/automx/instance;
access_log /var/log/nginx/%{hostname}-access.log; access_log /var/log/nginx/%{hostname}-access.log;
error_log /var/log/nginx/%{hostname}-error.log; error_log /var/log/nginx/%{hostname}-error.log;
@@ -15,3 +16,39 @@ server {
uwsgi_pass automx; uwsgi_pass automx;
} }
} }
server {
listen 443 ssl;
listen [::]:443 ssl;
server_name autodiscover.{domain};
root /srv/automx/instance;
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_prefer_server_ciphers on;
ssl_session_cache shared:SSL:10m;
ssl_verify_depth 3;
ssl_dhparam /etc/nginx/dhparam.pem;
client_max_body_size 10M;
access_log /var/log/nginx/autodiscover.%{domain}-access.log;
error_log /var/log/nginx/autodiscover.%{domain}-error.log;
location ~* ^/autodiscover/autodiscover.xml {
include uwsgi_params;
uwsgi_pass automx;
}
location /mail/config-v1.1.xml {
include uwsgi_params;
uwsgi_pass automx;
}
location /mobileconfig {
include uwsgi_params;
uwsgi_pass automx;
}
}

2
modoboa_installer/scripts/nginx.py
View File

@@ -63,7 +63,7 @@ class Nginx(base.Installer):
self.config.get("general", "domain")) self.config.get("general", "domain"))
self._setup_config("automx", hostname) self._setup_config("automx", hostname)
extra_modoboa_config = """ extra_modoboa_config = """
location /autodiscover/autodiscover.xml { location ~* ^/autodiscover/autodiscover.xml {
include uwsgi_params; include uwsgi_params;
uwsgi_pass automx; uwsgi_pass automx;
} }