From c31410be971ae23c5693a1be99a7c4dda1281fe4 Mon Sep 17 00:00:00 2001 From: Chuan Ji Date: Fri, 22 Jun 2018 00:34:44 -0700 Subject: [PATCH] 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"', + ])) +