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

Merge branch 'master' of github.com:modoboa/modoboa-installer

Browse Source
This commit is contained in:
Antoine Nguyen
2018-10-01 15:53:47 +02:00
parent 2b8393e2d4 13e14f5fb6
commit d28346efec
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
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;

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;
} }