Merge branch 'release-3.3' RC3

1 files changed, 20 insertions, 0 deletions

diff --git a/webapp/components/admin_console/configuration_settings.jsx b/webapp/components/admin_console/configuration_settings.jsx
index e34167a30..6a07e31cd 100644
--- a/webapp/components/admin_console/configuration_settings.jsx
+++ b/webapp/components/admin_console/configuration_settings.jsx
@@ -28,6 +28,7 @@ export default class ConfigurationSettings extends AdminSettings {
     }
 
     getConfigFromState(config) {
+        config.ServiceSettings.SiteURL = this.state.siteURL;
         config.ServiceSettings.ListenAddress = this.state.listenAddress;
         config.ServiceSettings.WebserverMode = this.state.webserverMode;
 
@@ -36,6 +37,7 @@ export default class ConfigurationSettings extends AdminSettings {
 
     getStateFromConfig(config) {
         return {
+            siteURL: config.ServiceSettings.SiteURL,
             listenAddress: config.ServiceSettings.ListenAddress,
             webserverMode: config.ServiceSettings.WebserverMode
         };
@@ -56,6 +58,24 @@ export default class ConfigurationSettings extends AdminSettings {
         return (
             <SettingsGroup>
                 <TextSetting
+                    id='siteURL'
+                    label={
+                        <FormattedMessage
+                            id='admin.service.siteURL'
+                            defaultMessage='Site URL:'
+                        />
+                    }
+                    placeholder={Utils.localizeMessage('admin.service.siteURLExample', 'Ex "https://mattermost.example.com:1234"')}
+                    helpText={
+                        <FormattedMessage
+                            id='admin.service.siteURLDescription'
+                            defaultMessage='The URL, including port number and protocol, from which users will access Mattermost. Leave blank to automatically configure based on incoming traffic.'
+                        />
+                    }
+                    value={this.state.siteURL}
+                    onChange={this.handleChange}
+                />
+                <TextSetting
                     id='listenAddress'
                     label={
                         <FormattedMessage