From 7095c1f60539e2c49cbb89987aca1f7ed979f80c Mon Sep 17 00:00:00 2001 From: Jakob Date: Sun, 2 Jun 2019 11:32:18 +0200 Subject: [PATCH 1/2] Update emailwiz.sh Deleting all settings starting with o seems rather arbitrary, but I don't know the default configuration on Vultr, so could be warranted :) But I'll be bold and guess the `sed` command and the following lines are supposed to be related? --- emailwiz.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emailwiz.sh b/emailwiz.sh index 0c5eb30..44dba4e 100755 --- a/emailwiz.sh +++ b/emailwiz.sh @@ -55,7 +55,7 @@ postconf -e "home_mailbox = Mail/Inbox/" echo "Configuring Postfix's master.cf..." -sed -i "/^\s*o/d;/^\s*submission/d;/^\s*smtp/d" /etc/postfix/master.cf +sed -i "/^\s*-o/d;/^\s*submission/d;/^\s*smtp/d" /etc/postfix/master.cf echo "smtp unix - - n - - smtp smtp inet n - y - - smtpd From db265994ac7c81bebab86b6d0d59e8b7f9cf86c4 Mon Sep 17 00:00:00 2001 From: ayoung012 Date: Fri, 7 Jun 2019 23:30:01 +1000 Subject: [PATCH 2/2] prevent false detection of opendkim KeyTable config default /etc/opendkim.conf has KeyTable appear in comment doco and example. Shouldn't trigger the grep that checks whether this config has been applied. --- emailwiz.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emailwiz.sh b/emailwiz.sh index 44dba4e..4fefa74 100755 --- a/emailwiz.sh +++ b/emailwiz.sh @@ -177,7 +177,7 @@ grep "127.0.0.1" >/dev/null 2>&1 /etc/postfix/dkim/trustedhosts || 1.2.3.4/24" >> /etc/postfix/dkim/trustedhosts # ...and source it from opendkim.conf -grep KeyTable /etc/opendkim.conf >/dev/null || echo "KeyTable file:/etc/postfix/dkim/keytable +grep ^KeyTable /etc/opendkim.conf >/dev/null || echo "KeyTable file:/etc/postfix/dkim/keytable SigningTable refile:/etc/postfix/dkim/signingtable InternalHosts refile:/etc/postfix/dkim/trustedhosts" >> /etc/opendkim.conf