From 983b99e86d9865e6ec82856f192461cbbdde56a5 Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Sun, 11 Oct 2020 14:25:47 -0400
Subject: fix #72

---
 emailwiz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'emailwiz.sh')

diff --git a/emailwiz.sh b/emailwiz.sh
index 57f68c7..e24c089 100755
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -274,7 +274,7 @@ for x in dovecot postfix opendkim spamassassin; do
 	service "$x" restart && printf " ...done\\n"
 done
 
-pval="$(tr -d "\n" </etc/postfix/dkim/mail.txt | sed "s/k=rsa.* \"p=/k=rsa; p=/;s/\"\s*\"//;s/\"\s*).*//" | grep -o "p=.*")"
+pval="$(tr -d "\n" </etc/postfix/dkim/$subdom.txt | sed "s/k=rsa.* \"p=/k=rsa; p=/;s/\"\s*\"//;s/\"\s*).*//" | grep -o "p=.*")"
 dkimentry="$subdom._domainkey.$domain	TXT	v=DKIM1; k=rsa; $pval"
 dmarcentry="_dmarc.$domain	TXT	v=DMARC1; p=none; rua=mailto:dmarc@$domain; fo=1"
 spfentry="@	TXT	v=spf1 mx a:$maildomain -all"
-- 
cgit v1.2.3


From f41246d575d5d9de7156973ad1bcf36b50cb91d7 Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Sun, 11 Oct 2020 14:46:45 -0400
Subject: more robust

---
 emailwiz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'emailwiz.sh')

diff --git a/emailwiz.sh b/emailwiz.sh
index e24c089..837ea1c 100755
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -253,7 +253,7 @@ sed -i '/^#Canonicalization/s/simple/relaxed\/simple/' /etc/opendkim.conf
 sed -i '/^#Canonicalization/s/^#//' /etc/opendkim.conf
 
 sed -e '/Socket/s/^#*/#/' -i /etc/opendkim.conf
-sed -i '/\local:\/var\/run\/opendkim\/opendkim.sock/a \Socket\t\t\tinet:12301@localhost' /etc/opendkim.conf
+grep -q "^Socket\s*inet:12301@localhost" /etc/opendkim.conf || echo "Socket inet:12301@localhost" >> /etc/opendkim.conf
 
 # OpenDKIM daemon settings, removing previously activated socket.
 sed -i "/^SOCKET/d" /etc/default/opendkim && echo "SOCKET=\"inet:12301@localhost\"" >> /etc/default/opendkim
-- 
cgit v1.2.3


From 1ab9f432df8912e26677935e4d4a26cf278f6a6c Mon Sep 17 00:00:00 2001
From: Luke Smith <luke@lukesmith.xyz>
Date: Sat, 14 Nov 2020 14:18:50 -0500
Subject: log in with full email addr instead of username documentation changes

---
 emailwiz.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'emailwiz.sh')

diff --git a/emailwiz.sh b/emailwiz.sh
index 837ea1c..20685ea 100755
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -130,6 +130,7 @@ ssl_key = <$certdir/privkey.pem
 ssl_dh = </usr/share/dovecot/dh.pem
 # Plaintext login. This is safe and easy thanks to SSL.
 auth_mechanisms = plain login
+auth_username_format = %n
 
 protocols = \$protocols imap
 
@@ -286,7 +287,6 @@ $dmarcentry
 $spfentry" > "$HOME/dns_emailwizard"
 
 echo "
-
  _   _
 | \ | | _____      ___
 |  \| |/ _ \ \ /\ / (_)
-- 
cgit v1.2.3