IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-5904 (WebApp): Config for skip email server cert verification. (#5991)

Browse Source
This commit is contained in:
George Goldberg
2017-04-05 13:56:03 +01:00
committed by Harrison Healey
parent 22005f876f
commit 92dd07def8
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webapp/components/admin_console/email_settings.jsx
View File

@@ -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
};
}
@@ -274,6 +276,23 @@ export default class EmailSettings extends AdminSettings {
getConfigFromState={this.getConfigFromState}
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={