| @@ -172,6 +172,7 @@ auth on | |||||
| tls on | tls on | ||||
| tls_trust_file $mwsslcert | tls_trust_file $mwsslcert | ||||
| #logfile ${XDG_LOG_HOME:-$HOME}/msmtp.log | #logfile ${XDG_LOG_HOME:-$HOME}/msmtp.log | ||||
| EOF | EOF | ||||
| else | else | ||||
| sed -i "/account $mwaddr/,/^\(\s*$\|account\)/d" "$mwmsmtprc" &>/dev/null | sed -i "/account $mwaddr/,/^\(\s*$\|account\)/d" "$mwmsmtprc" &>/dev/null | ||||
| @@ -184,6 +185,7 @@ from $mwaddr | |||||
| user $mwlogin | user $mwlogin | ||||
| passwordeval "pass $mwpass" | passwordeval "pass $mwpass" | ||||
| $mwstarttlsoff | $mwstarttlsoff | ||||
| EOF | EOF | ||||
| case "$mwservice" in | case "$mwservice" in | ||||
| protonmail.ch|protonmail.com|pm.me) _mwprotonfinger || return 1 ;; | protonmail.ch|protonmail.com|pm.me) _mwprotonfinger || return 1 ;; | ||||
| @@ -222,6 +224,7 @@ Create Both | |||||
| SyncState * | SyncState * | ||||
| MaxMessages 0 | MaxMessages 0 | ||||
| # End $_MW_ profile | # End $_MW_ profile | ||||
| EOF | EOF | ||||
| } | } | ||||
| @@ -245,6 +248,7 @@ delete = true | |||||
| #message_log = ${XDG_LOG_HOME:-$HOME}/getmail.log | #message_log = ${XDG_LOG_HOME:-$HOME}/getmail.log | ||||
| # vim: ft=conf | # vim: ft=conf | ||||
| EOF | EOF | ||||
| } | } | ||||
| @@ -323,6 +327,7 @@ exclude_tags=deleted;spam; | |||||
| synchronize_flags=true | synchronize_flags=true | ||||
| [crypto] | [crypto] | ||||
| gpg_path=$GPG" | gpg_path=$GPG" | ||||
| EOF | EOF | ||||
| } | } | ||||
| @@ -484,6 +489,7 @@ _mwgenmwaccmuttrc() { | |||||
| # generated by $_MW_ | # generated by $_MW_ | ||||
| set from = "$mwaddr" | set from = "$mwaddr" | ||||
| EOF | EOF | ||||
| if [ "$mwtype" = "offline" ]; then | if [ "$mwtype" = "offline" ]; then | ||||
| cat >> "$mwaccmuttrc" <<EOF | cat >> "$mwaccmuttrc" <<EOF | ||||
| @@ -530,12 +536,14 @@ set ssl_starttls = ${mwssl/nos/yes} | |||||
| set ssl_force_tls = ${mwssl/nos/yes} | set ssl_force_tls = ${mwssl/nos/yes} | ||||
| set smtp_pass = "\`pass $mwpass\`" | set smtp_pass = "\`pass $mwpass\`" | ||||
| EOF | EOF | ||||
| fi # imap | fi # imap | ||||
| #smtp | #smtp | ||||
| [ "$mwsport" = "25" ] && mwsmtp="smtp" || mwsmtp="smtps" | [ "$mwsport" = "25" ] && mwsmtp="smtp" || mwsmtp="smtps" | ||||
| cat >> "$mwaccmuttrc" <<EOF | cat >> "$mwaccmuttrc" <<EOF | ||||
| set smtp_url = "$mwsmtp://$mwlogin@$mwsurl:$mwsport" | set smtp_url = "$mwsmtp://$mwlogin@$mwsurl:$mwsport" | ||||
| EOF | EOF | ||||
| fi #online | fi #online | ||||
| mwboxes="$(echo "$mwmailboxes" | sed -e "s/^ //g;s/.*/\"=\0\"/g" | tr "\n" " ")" | mwboxes="$(echo "$mwmailboxes" | sed -e "s/^ //g;s/.*/\"=\0\"/g" | tr "\n" " ")" | ||||
| @@ -555,6 +563,7 @@ EOF | |||||
| [ -n "$mwname" ] && cat >> "$mwaccmuttrc" <<EOF | [ -n "$mwname" ] && cat >> "$mwaccmuttrc" <<EOF | ||||
| set realname = "$mwname" | set realname = "$mwname" | ||||
| alias me $mwname <$mwaddr> | alias me $mwname <$mwaddr> | ||||
| EOF | EOF | ||||
| IFS=$'\n' | IFS=$'\n' | ||||
| for eqbox in $mwmailboxes; do | for eqbox in $mwmailboxes; do | ||||