X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=buster%2Fsetup_scripts%2Fsetup_mail.sh;fp=buster%2Fsetup_scripts%2Fsetup_mail.sh;h=dd8f80f8e63e3f60d03b3e39a76617cd90f05102;hb=decb103a10c87150712da651e9c5b99ac35dab26;hp=e65c036645ed6d82a8accdc88e9cc4d9c082b775;hpb=2bcc40a1815aca4ff5eb05ea6a38f0ad7a306432;p=config
diff --git a/buster/setup_scripts/setup_mail.sh b/buster/setup_scripts/setup_mail.sh
index e65c036..dd8f80f 100755
--- a/buster/setup_scripts/setup_mail.sh
+++ b/buster/setup_scripts/setup_mail.sh
@@ -34,12 +34,12 @@ certbot certonly --standalone --agree-tos --no-eff-email -m "${mail}" -d "$(host
# For if FQDN != mail domain name.
sed -i "s/REPLACE_maildomain_ECALPER/${mail_domain}/g" /etc/mailutils.conf
-sed -i 's/REPLACE_mail_domain_ECALPER/${mail_domain}/g' /etc/postfix/main.cf
+sed -i "s/REPLACE_maildomain_ECALPER/${mail_domain}/g" /etc/postfix/main.cf
# OpenDKIM setup.
selector=$(hostname)$(date +%Y%m%d)
opendkim-genkey -d "${mail_domain}" -D /etc/dkimkeys -s "${selector}"
-sed -i "s/REPLACE_hostname_ECALPER/$(hostname -f)/g" /etc/opendkim.conf
+sed -i "s/REPLACE_maildomain_ECALPER/${mail_domain}/g" /etc/opendkim.conf
sed -i "s/REPLACE_selector_ECALPER/${selector}/g" /etc/opendkim.conf
# Dovecot sieve filtering via LMTP. Without this, mail only gets
@@ -97,8 +97,8 @@ service dovecot restart
# Pingmail and fetchmail have some systemd timers waiting. To let systemd
# know about them, do this.
systemctl daemon-reload
-#systemctl enable --now fetchmail_old_account.timer
-#systemctl enable --now pingmail.timer
+systemctl enable --now fetchmail_old_account.timer
+systemctl enable --now pingmail.timer
# Final advice to user.
echo "To put into DNS:"