From eb0b8ca346bce4aee213c585cfd78b143f7052cc Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Tue, 8 Dec 2015 13:02:38 -0800 Subject: Update Configuration-Settings.md 1) Update config documentation changed in this [PR](https://github.com/mattermost/platform/pull/1555/files#diff-6a02156604c06becbe5fdca178766accL71) --- doc/install/Configuration-Settings.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 66fda15e0..5bba4b596 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -291,16 +291,13 @@ 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. +### Email Settings -```"ApplePushCertPublic": ""``` -Setting for features in development. +```"SendPushNotifications": true``` +"true": Your mattermsot server sends mobile push notifications to the server specified in **PushNotificationServer**; "false": Mobile push notifications are disabled. -```"ApplePushCertPrivate": ""``` -Setting for features in development. +```"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 -- cgit v1.2.3-1-g7c22 From 262ba237ad767d0ac2a47913517282d144990e51 Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Tue, 8 Dec 2015 13:10:17 -0800 Subject: Update Configuration-Settings.md Move push notification Settings under email settings --- doc/install/Configuration-Settings.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'doc') 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"``` -- cgit v1.2.3-1-g7c22