diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-10-03 16:03:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 16:03:15 -0400 |
| commit | 8f91c777559748fa6e857d9fc1f4ae079a532813 (patch) | |
| tree | 190f7cef373764a0d47a91045fdb486ee3d6781d /config | |
| parent | 5f8e5c401bd96cba9a98b2db02d72f9cbacb0103 (diff) | |
| download | chat-8f91c777559748fa6e857d9fc1f4ae079a532813.tar.gz chat-8f91c777559748fa6e857d9fc1f4ae079a532813.tar.bz2 chat-8f91c777559748fa6e857d9fc1f4ae079a532813.zip | |
Adding ability to serve TLS directly from Mattermost server (#4119)
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json index 44e52d88e..e96a9b237 100644 --- a/config/config.json +++ b/config/config.json @@ -2,6 +2,14 @@ "ServiceSettings": { "SiteURL": "", "ListenAddress": ":8065", + "ConnectionSecurity": "", + "TLSCertFile": "", + "TLSKeyFile": "", + "UseLetsEncrypt": false, + "LetsEncryptCertificateCacheFile": "./config/letsencrypt.cache", + "Forward80To443": false, + "ReadTimeout": 30, + "WriteTimeout": 60, "MaximumLoginAttempts": 10, "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", @@ -231,4 +239,4 @@ "TurnUsername": "", "TurnSharedKey": "" } -}
\ No newline at end of file +} |