diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2020-11-30 18:54:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 18:54:06 -0500 |
| commit | a60f347f2a88c1108152767a56b5f597f5b8a94f (patch) | |
| tree | 9e035a893d3d5e945dba57d0ec519ec566ecf260 /emailwiz.sh | |
| parent | 591d356dd200eca3ec6a976c7046cdb181cdb130 (diff) | |
| parent | 1ab9f432df8912e26677935e4d4a26cf278f6a6c (diff) | |
Merge branch 'master' into enhance
Diffstat (limited to 'emailwiz.sh')
| -rwxr-xr-x | emailwiz.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/emailwiz.sh b/emailwiz.sh index 57f68c7..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 @@ -253,7 +254,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 @@ -274,7 +275,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" @@ -286,7 +287,6 @@ $dmarcentry $spfentry" > "$HOME/dns_emailwizard" echo " - _ _ | \ | | _____ ___ | \| |/ _ \ \ /\ / (_) |