Merge branch 'master' into master

2018-06-09 09:44:26 +02:00
parent d20cc8b847 ab1c8254e0
commit 15c970cea0
45 changed files with 1961 additions and 187 deletions
--- a/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl
+++ b/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl
@@ -42,4 +42,5 @@ server {
        uwsgi_param UWSGI_SCRIPT instance.wsgi:application;
        uwsgi_pass modoboa;
    }
+    %{extra_config}
 }