diff options
| author | Eric Sethna <eric@spinpunch.com> | 2015-12-08 13:10:17 -0800 |
|---|---|---|
| committer | Eric Sethna <eric@spinpunch.com> | 2015-12-08 13:10:17 -0800 |
| commit | 262ba237ad767d0ac2a47913517282d144990e51 (patch) | |
| tree | cb5383aa22601be7f423a92961d91ca3235e2e93 /doc | |
| parent | eb0b8ca346bce4aee213c585cfd78b143f7052cc (diff) | |
| download | chat-262ba237ad767d0ac2a47913517282d144990e51.tar.gz chat-262ba237ad767d0ac2a47913517282d144990e51.tar.bz2 chat-262ba237ad767d0ac2a47913517282d144990e51.zip | |
Update Configuration-Settings.md
Move push notification Settings under email settings
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/install/Configuration-Settings.md | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 5bba4b596..46a6defdf 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -141,9 +141,16 @@ Port of SMTP email server. ```"InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS"``` 32-character (to be randomly generated via Admin Console) salt added to signing of email invites. - ```"PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL"``` -32-character (to be randomly generated via Admin Console) salt added to signing of password reset emails. +32-character (to be randomly generated via Admin Console) salt added to signing of password reset emails. + +#### Push Notification Settings + +```"SendPushNotifications": true``` +"true": Your mattermsot server sends mobile push notifications to the server specified in **PushNotificationServer**; "false": Mobile push notifications are disabled. + +```"PushNotificationServer": "https://push.mattermost.com"``` +Address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services). ### File Settings @@ -291,14 +298,6 @@ System Console allows an IT Admin to update settings defined in `config.json`. H ```"EnableOAuthServiceProvider": false``` ”true”: Allow Mattermost to function as an OAuth provider, allowing 3rd party apps access to your user store for authentication. -### Email Settings - -```"SendPushNotifications": true``` -"true": Your mattermsot server sends mobile push notifications to the server specified in **PushNotificationServer**; "false": Mobile push notifications are disabled. - -```"PushNotificationServer": "https://push.mattermost.com"``` -Address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services). - ### File Settings ```"InitialFont": "luximbi.ttf"``` |