From d20cc8b847d1a31e70d9874d917b59ef05e82e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois.schmidts@gmail.com>
Date: Wed, 6 Jun 2018 14:51:12 +0200
Subject: [PATCH 1/2] making vhost listen to ipv6 also

---
 modoboa_installer/scripts/files/nginx/automx.conf.tpl  | 3 ++-
 modoboa_installer/scripts/files/nginx/modoboa.conf.tpl | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modoboa_installer/scripts/files/nginx/automx.conf.tpl b/modoboa_installer/scripts/files/nginx/automx.conf.tpl
index 96ec266..4cd0591 100644
--- a/modoboa_installer/scripts/files/nginx/automx.conf.tpl
+++ b/modoboa_installer/scripts/files/nginx/automx.conf.tpl
@@ -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;
     }
-}
\ No newline at end of file
+}
diff --git a/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl b/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl
index ac23191..7669b8d 100644
--- a/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl
+++ b/modoboa_installer/scripts/files/nginx/modoboa.conf.tpl
@@ -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;
 
@@ -40,4 +42,4 @@ server {
         uwsgi_param UWSGI_SCRIPT instance.wsgi:application;
         uwsgi_pass modoboa;
     }
-}
\ No newline at end of file
+}

From c31410be971ae23c5693a1be99a7c4dda1281fe4 Mon Sep 17 00:00:00 2001
From: Chuan Ji <chuan@jichu4n.com>
Date: Fri, 22 Jun 2018 00:34:44 -0700
Subject: [PATCH 2/2] Update /etc/default/opendkim on Debian-based system post
 installation.

Resolves #207.
---
 modoboa_installer/scripts/opendkim.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modoboa_installer/scripts/opendkim.py b/modoboa_installer/scripts/opendkim.py
index 34bdebf..18ce4ad 100644
--- a/modoboa_installer/scripts/opendkim.py
+++ b/modoboa_installer/scripts/opendkim.py
@@ -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"',
+          ]))
+