various fixes and additions on desktop

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index d7901e7b5f61d5e56dc8d5f36b99b0a25f341469..19676b2f898ac7ff962c45de98b5d24ff600e65e 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -538,9 +538,9 @@ if [[ -e $f ]]; then
 fi
 if [[ $HOSTNAME == $MAIL_HOST ]]; then
     local_mx=mail.iankelling.org
-    rsync_common="rsync -ogt --chown=root:Debian-exim --chmod=640 root@li:/p/c/machine_specific/li/webservercerts/$local_mx-"
-    ${rsync_common}chained.pem /etc/exim4/exim.crt
-    ${rsync_common}domain.key /etc/exim4/exim.key
+    rsync_common="rsync -ogtL --chown=root:Debian-exim --chmod=640 root@li:/etc/letsencrypt/live/$local_mx/"
+    ${rsync_common}fullchain.pem /etc/exim4/exim.crt
+    ${rsync_common}privkey.pem /etc/exim4/exim.key
 fi
 EOF
     chmod 755 $f
@@ -552,7 +552,7 @@ After=multi-user.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/bin/sysd-mail-once mailcert /usr/local/bin/mail-cert-cron
+ExecStart=/a/bin/log-quiet/sysd-mail-once mailcert /usr/local/bin/mail-cert-cron
 EOF
 
     cat >/etc/systemd/system/mailcert.timer <<'EOF'
@@ -771,7 +771,7 @@ dir=/nocow/$type
 sdir=/var/spool/$type
 # we only do this if our system has $dir
 if [[ -e $dir && $(readlink -f $sdir) != $dir ]]; then
-    systectl stop $type
+    systemctl stop $type
     if [[ ! -e $dir && -d $sdir ]]; then
         mv $sdir $dir
     fi