| @@ -229,19 +229,19 @@ chmod g+r /etc/postfix/dkim/* | |||||
| # Generate the OpenDKIM info: | # Generate the OpenDKIM info: | ||||
| echo "Configuring OpenDKIM..." | echo "Configuring OpenDKIM..." | ||||
| grep -q "$domain" /etc/postfix/dkim/keytable || | |||||
| grep -q "$domain" /etc/postfix/dkim/keytable 2>/dev/null || | |||||
| echo "$subdom._domainkey.$domain $domain:mail:/etc/postfix/dkim/mail.private" >> /etc/postfix/dkim/keytable | echo "$subdom._domainkey.$domain $domain:mail:/etc/postfix/dkim/mail.private" >> /etc/postfix/dkim/keytable | ||||
| grep -q "$domain" /etc/postfix/dkim/signingtable || | |||||
| grep -q "$domain" /etc/postfix/dkim/signingtable 2>/dev/null || | |||||
| echo "*@$domain $subdom._domainkey.$domain" >> /etc/postfix/dkim/signingtable | echo "*@$domain $subdom._domainkey.$domain" >> /etc/postfix/dkim/signingtable | ||||
| grep -q "127.0.0.1" /etc/postfix/dkim/trustedhosts || | |||||
| grep -q "127.0.0.1" /etc/postfix/dkim/trustedhosts 2>/dev/null || | |||||
| echo "127.0.0.1 | echo "127.0.0.1 | ||||
| 10.1.0.0/16 | 10.1.0.0/16 | ||||
| 1.2.3.4/24" >> /etc/postfix/dkim/trustedhosts | 1.2.3.4/24" >> /etc/postfix/dkim/trustedhosts | ||||
| # ...and source it from opendkim.conf | # ...and source it from opendkim.conf | ||||
| grep -q "^KeyTable" /etc/opendkim.conf || echo "KeyTable file:/etc/postfix/dkim/keytable | |||||
| grep -q "^KeyTable" /etc/opendkim.conf 2>/dev/null || echo "KeyTable file:/etc/postfix/dkim/keytable | |||||
| SigningTable refile:/etc/postfix/dkim/signingtable | SigningTable refile:/etc/postfix/dkim/signingtable | ||||
| InternalHosts refile:/etc/postfix/dkim/trustedhosts" >> /etc/opendkim.conf | InternalHosts refile:/etc/postfix/dkim/trustedhosts" >> /etc/opendkim.conf | ||||