summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Smith <luke@lukesmith.xyz>2022-03-29 09:41:29 -0400
committerLuke Smith <luke@lukesmith.xyz>2022-03-29 09:41:29 -0400
commit6cd64f5c2ee756956e5c3ab57edb68d9fd86e59c (patch)
tree6e3af29892d7c984ed7b00c8af59b37bea1ec008
parent0409745a9ddec01a7c4567d936adc95f84a08146 (diff)
postfix-pcre added, 1.2.3.4 not trusted
-rwxr-xr-xemailwiz.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/emailwiz.sh b/emailwiz.sh
index a8caa66..92c8c2e 100755
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -37,7 +37,7 @@ echo "Setting umask to 0022..."
umask 0022
echo "Installing programs..."
-apt install postfix dovecot-imapd dovecot-sieve opendkim spamassassin spamc
+apt install postfix postfix-pcre dovecot-imapd dovecot-sieve opendkim spamassassin spamc
# Check if OpenDKIM is installed and install it if not.
which opendkim-genkey >/dev/null 2>&1 || apt install opendkim-tools
domain="$(cat /etc/mailname)"
@@ -273,8 +273,7 @@ echo "*@$domain $subdom._domainkey.$domain" >> /etc/postfix/dkim/signingtable
grep -q '127.0.0.1' /etc/postfix/dkim/trustedhosts 2>/dev/null ||
echo '127.0.0.1
-10.1.0.0/16
-1.2.3.4/24' >> /etc/postfix/dkim/trustedhosts
+10.1.0.0/16' >> /etc/postfix/dkim/trustedhosts
# ...and source it from opendkim.conf
grep -q '^KeyTable' /etc/opendkim.conf 2>/dev/null || echo 'KeyTable file:/etc/postfix/dkim/keytable