various fixes and improvements

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index 7674921a7ae489c319f0149f36f8ef7c144bf82a..70a15a26d277418dc0edee13612be3b95a3d8438 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -55,7 +55,7 @@ u=$SUDO_USER
 # apg -m 50 -x 70 -n 1 -a 1 -M CLN >$f
 # s sed -i "/^$user:/d" /p/c/filesystem/etc/exim4/passwd
 # echo "$user:$(mkpasswd -m sha-512 -s <$f)" >>/p/c/filesystem/etc/exim4/passwd
-# echo "mail.iankelling.org:$user:$(<$f)" >> /p/c/machine_specific/$user/filesystem/etc/mailpass
+# echo "mail.iankelling.org $user $(<$f)" >> /p/c/machine_specific/$user/filesystem/etc/mailpass
 # # then run this script, or part of it which uses /etc/mailpass
 
 # # dovecot password, i just need 1 as I\'m the only user
@@ -279,7 +279,7 @@ else # begin exim. has debian specific stuff for now
 
     if [[ -e /p/c/filesystem ]]; then
         # to put the hostname in the known hosts
-        ssh -o StrictHostKeyChecking=no li.iankelling.org :
+        ssh -o StrictHostKeyChecking=no root@li.iankelling.org :
         /a/exe/vpn-mk-client-cert -b mail -n mail li.iankelling.org
     fi
 
@@ -470,7 +470,7 @@ EOF
         # would be unused in that config type.
         cat >$exim_main_dir/000_localmacros <<EOF
 # i don't have ipv6 setup for my tunnel yet.
-diable_ipv6 = true
+disable_ipv6 = true
 
 MAIN_TLS_ENABLE = true