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

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

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

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

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

22
modoboa_installer/scripts/opendkim.py
View File

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