X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=all_new_2018%2Fsetup_mail.sh;h=c6a0e631531d5627fb527c8abece99016a65a67d;hb=f2a01cfd1fb4fc2510ce1df00def189a10be42d7;hp=285ecb689b63481b052295cb348c68bdbbd59704;hpb=6d6eb420342c2962063f92f8fc5e8b23e5cb1dbf;p=config
diff --git a/all_new_2018/setup_mail.sh b/all_new_2018/setup_mail.sh
index 285ecb6..c6a0e63 100755
--- a/all_new_2018/setup_mail.sh
+++ b/all_new_2018/setup_mail.sh
@@ -1,8 +1,8 @@
#/bin/sh
set -e
-selector=$1
-if [ ! -n "${selector}" ]; then
+dkim_selector=$1
+if [ ! -n "${dkim_selector}" ]; then
echo "Give DKIM selector argument."
false
fi
@@ -12,14 +12,17 @@ mkdir -p /etc/dkimkeys/
add_dkim_record=0
if [ ! -f "/etc/dkimkeys/${dkim_selector}.private" ]; then
add_dkim_record=1
+ set +e
dpkg -s opendkim-tools &> /dev/null
preinstalled="$?"
+ set -e
if [ ! "${preinstalled}" -eq "0" ]; then
apt install -y opendkim-tools
fi
opendkim-genkey -s "${dkim_selector}"
+ mv "${dkim_selector}.private" /etc/dkimkeys/
if [ ! "${preinstalled}" -eq "0" ]; then
- apt --purge autoremove opendkim-tools
+ apt -y --purge autoremove opendkim-tools
fi
fi
@@ -40,8 +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
-echo "TODO: Ensure a proper SPF entry for this system in your DNS configuration."
+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 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"