* Fix: SMTP local relay

* Fix SMTP SSL description

* ✌️
This commit is contained in:
MeiMei 2018-11-30 00:03:28 +09:00 committed by syuilo
parent 15efbfb244
commit 3bde4285eb
3 changed files with 6 additions and 4 deletions

View File

@ -1134,7 +1134,8 @@ admin/views/instance.vue:
email-config-info: "メールアドレス確認やパスワードリセットの際に使われます。"
enable-email: "メール配信を有効にする"
email: "メールアドレス"
smtp-use-ssl: "SMTPサーバーはSSLを使用"
smtp-secure: "SMTP接続に暗黙的なSSL/TLSを使用する"
smtp-secure-info: "STARTTLS使用時はオフにします。"
smtp-host: "SMTPホスト"
smtp-port: "SMTPポート"
smtp-user: "SMTPユーザー"

View File

@ -52,7 +52,7 @@
<ui-input v-model="smtpUser" :disabled="!enableEmail">{{ $t('smtp-user') }}</ui-input>
<ui-input v-model="smtpPass" :disabled="!enableEmail">{{ $t('smtp-pass') }}</ui-input>
</ui-horizon-group>
<ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-use-ssl') }}</ui-switch>
<ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<span slot="desc">{{ $t('smtp-secure-info') }}</span></ui-switch>
</section>
<section>
<header>summaly Proxy</header>

View File

@ -73,10 +73,11 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
host: meta.smtpHost,
port: meta.smtpPort,
secure: meta.smtpSecure,
auth: {
ignoreTLS: true,
auth: meta.smtpUser != null ? {
user: meta.smtpUser,
pass: meta.smtpPass
}
} : undefined
});
const link = `${config.url}/vefify-email/${code}`;