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-07-11 11:08:34 +02:00
parent 9eed99d884 18d32208ee
commit 6dc0a62ad7
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ upstream automx {
server {
listen 80;
listen [::]:80;
server_name %hostname;
access_log /var/log/nginx/%{hostname}-access.log;
@@ -13,4 +14,4 @@ server {
include uwsgi_params;
uwsgi_pass automx;
}
}
}

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

@@ -4,12 +4,14 @@ upstream modoboa {
server {
listen 80;
listen [::]:80;
server_name %hostname;
rewrite ^ https://$server_name$request_uri? permanent;
}
server {
listen 443 ssl;
listen [::]:443 ssl;
server_name %hostname;
root %app_instance_path;
@@ -41,4 +43,4 @@ server {
uwsgi_pass modoboa;
}
%{extra_config}
}
}

22
modoboa_installer/scripts/opendkim.py
View File

@@ -78,16 +78,16 @@ class Opendkim(base.Installer):
dbname, "dkim", self.app_config["dbuser"], "SELECT")
def post_run(self):
"""Addtional tasks."""
"""Additional tasks."""
if package.backend.FORMAT != "deb":
return
pattern = (
"s/^SOCKET=local:\$RUNDIR\/opendkim\.sock/"
"#SOCKET=local:\$RUNDIR\/opendkim\.sock/"
)
utils.exec_cmd("perl -pi -e '{}' /etc/default/opendkim".format(pattern))
pattern = (
"s/^#SOCKET=inet:12345\@localhost$/"
"SOCKET=inet:12345\@localhost/"
)
utils.exec_cmd("perl -pi -e '{}' /etc/default/opendkim".format(pattern))
params_file = "/etc/default/opendkim"
pattern = r"s/^(SOCKET=.*)/#\1/"
utils.exec_cmd(
"perl -pi -e '{}' {}".format(pattern, params_file))
with open(params_file, "a") as f:
f.write('\n'.join([
"",
'SOCKET="inet:12345@localhost"',
]))