From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 27 Nov 2018 22:47:42 +0000 (+0100)
Subject: WIP.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7B%20web_path%20%7D%7D/static/%7B%7Bitem_name%7D%7D?a=commitdiff_plain;h=77e391b5ded27dfcc9bfc7181c1d581adbaa0df6;p=config

WIP.
---

diff --git a/all_new_2018/letsencrypt.sh b/all_new_2018/letsencrypt.sh
index c89e37f..2e6a03b 100755
--- a/all_new_2018/letsencrypt.sh
+++ b/all_new_2018/letsencrypt.sh
@@ -35,7 +35,7 @@ if [ "${action}" = "set" ]; then
     fi
     mail="$3"
     domain="$4"
-    ssh -t plom@${server} "su -c 'apt -y install certbot && certbot certonly --standalone --agree-tos -m ${mail} -d ${server}'"
+    ssh -t plom@${server} "su -c 'apt update && apt -y install certbot && certbot certonly --standalone --agree-tos -m ${mail} -d ${server}'"
 elif [ "${action}" = "get" ]; then
     # Get /etc/letsencrypt/ as tar file.
     ssh -t plom@${server} 'su -c "cd /etc/ && tar cf letsencrypt.tar letsencrypt && chown plom:plom letsencrypt.tar && mv letsencrypt.tar /home/plom/"'
diff --git a/all_new_2018/setup_mail.sh b/all_new_2018/setup_mail.sh
index f19d36e..c6a0e63 100755
--- a/all_new_2018/setup_mail.sh
+++ b/all_new_2018/setup_mail.sh
@@ -43,9 +43,9 @@ echo "postfix postfix/mailname string $(hostname -f)" | debconf-set-selections
 echo "$(hostname -f)" > /etc/mailname
 
 # Everything should now be ready for installations.
-apt install -y postfix dovecot-imapd opendkim
+apt install -y -o Dpkg::Options::=--force-confold postfix dovecot-imapd opendkim
 echo "TODO: Ensure MX entry for your system in your DNS configuration."
-echo "TODO: Ensure a proper SPF entry for this system in your DNS configuration; something like 'v=spf1 a mx -all' mapped to your subdomain."
+echo "TODO: Ensure a proper SPF entry for this system in your DNS configuration; something like 'v=spf1 a mx -all' mapped to your host."
 if [ "${add_dkim_record}" -eq "1" ]; then
     echo "TODO: Add the following DKIM entry to your DNS configuration (possibly with slightly changed host entry – if your mail domain includes a subdomain, append that with a dot):"
     cat "${dkim_selector}.txt"