From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 26 May 2020 23:14:23 +0000 (+0200)
Subject: Fix.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/static/%7B%7B%20web_path%20%7D%7D/tasks?a=commitdiff_plain;h=decb103a10c87150712da651e9c5b99ac35dab26;p=config

Fix.
---

diff --git a/buster/other_files/append_opendkim.conf b/buster/other_files/append_opendkim.conf
index 67bd960..ee5dc14 100644
--- a/buster/other_files/append_opendkim.conf
+++ b/buster/other_files/append_opendkim.conf
@@ -1,6 +1,6 @@
 
 # plomlompom customizations
-Domain REPLACE_hostname_ECALPER
+Domain REPLACE_maildomain_ECALPER
 KeyFile /etc/dkimkeys/REPLACE_selector_ECALPER.private
 Selector REPLACE_selector_ECALPER
 Socket inet:8892@localhost
diff --git a/buster/other_files/append_postfix_main.cf b/buster/other_files/append_postfix_main.cf
index 8bb38a8..385058c 100644
--- a/buster/other_files/append_postfix_main.cf
+++ b/buster/other_files/append_postfix_main.cf
@@ -20,4 +20,4 @@ smtpd_sasl_path = private/auth
 smtpd_sasl_auth_enable = yes
 
 # we append mail domain here for if it is different than $myhostname 
-mydestination = $myhostname localhost.$mydomain localhost REPLACE_mail_domain_ECALPER 
+mydestination = $myhostname localhost.$mydomain localhost REPLACE_maildomain_ECALPER 
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:"