summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/email_settings.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components/admin_console/email_settings.jsx')
-rw-r--r--webapp/components/admin_console/email_settings.jsx19
1 files changed, 19 insertions, 0 deletions
diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx
index 6cf09f653..d54ab3906 100644
--- a/webapp/components/admin_console/email_settings.jsx
+++ b/webapp/components/admin_console/email_settings.jsx
@@ -34,6 +34,7 @@ export default class EmailSettings extends AdminSettings {
config.EmailSettings.ConnectionSecurity = this.state.connectionSecurity;
config.EmailSettings.EnableEmailBatching = this.state.enableEmailBatching;
config.ServiceSettings.EnableSecurityFixAlert = this.state.enableSecurityFixAlert;
+ config.EmailSettings.SkipServerCertificateVerification = this.state.skipServerCertificateVerification;
return config;
}
@@ -50,6 +51,7 @@ export default class EmailSettings extends AdminSettings {
smtpPort: config.EmailSettings.SMTPPort,
connectionSecurity: config.EmailSettings.ConnectionSecurity,
enableEmailBatching: config.EmailSettings.EnableEmailBatching,
+ skipServerCertificateVerification: config.EmailSettings.SkipServerCertificateVerification,
enableSecurityFixAlert: config.ServiceSettings.EnableSecurityFixAlert
};
}
@@ -275,6 +277,23 @@ export default class EmailSettings extends AdminSettings {
disabled={!this.state.sendEmailNotifications}
/>
<BooleanSetting
+ id='skipServerCertificateVerification'
+ label={
+ <FormattedMessage
+ id='admin.email.skipServerCertificateVerification.title'
+ defaultMessage='Skip Server Certificate Verification: '
+ />
+ }
+ helpText={
+ <FormattedMessage
+ id='admin.email.skipServerCertificateVerification.description'
+ defaultMessage='When true, Mattermost will not verify the email server certificate.'
+ />
+ }
+ value={this.state.skipServerCertificateVerification}
+ onChange={this.handleChange}
+ />
+ <BooleanSetting
id='enableSecurityFixAlert'
label={
<FormattedMessage