diff options
| author | Corey Hulen <corey@hulen.com> | 2015-12-08 13:57:50 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-12-08 13:57:50 -0800 |
| commit | f006951959acad76c8626d85fac3521d302bb0ee (patch) | |
| tree | 0c44cbf657a136439caebd4ce4f0e672c5eacbb5 | |
| parent | 682ed28be4c36bd0c607d1b86eaa4589ac9038d5 (diff) | |
| parent | 262ba237ad767d0ac2a47913517282d144990e51 (diff) | |
| download | chat-f006951959acad76c8626d85fac3521d302bb0ee.tar.gz chat-f006951959acad76c8626d85fac3521d302bb0ee.tar.bz2 chat-f006951959acad76c8626d85fac3521d302bb0ee.zip | |
Merge pull request #1662 from esethna/patch-39
Update Configuration-Settings.md
| -rw-r--r-- | doc/install/Configuration-Settings.md | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 66fda15e0..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,17 +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. -### Push Notification Settings - -```"ApplePushServer": ""``` -Setting for features in development. - -```"ApplePushCertPublic": ""``` -Setting for features in development. - -```"ApplePushCertPrivate": ""``` -Setting for features in development. - ### File Settings ```"InitialFont": "luximbi.ttf"``` |