Merge pull request #3831 from edx/nedbat/add-help-tokens-settings

Add HELP_TOKENS_BOOKS setting

CHANGELOG.md

 - Role: edxapp
+  - DOC_LINK_BASE settings will be obsoleted, replaced by HELP_TOKENS_BOOKS
+
+- Role: edxapp
   - Add the EDXAPP_LANGUAGE_COOKIE setting
+
 - Role: rabbitmq
   - Upgraded to 3.6.9
   - Switched to a PPA rather than a .deb hosted in S3

playbooks/roles/edxapp/defaults/main.yml

@@ -289,6 +289,10 @@ EDXAPP_LANGUAGE_CODE : 'en'
 EDXAPP_LANGUAGE_COOKIE: 'openedx-language-preference'
 EDXAPP_TIME_ZONE: 'America/New_York'
 
+EDXAPP_HELP_TOKENS_BOOKS:
+    learner: "http://edx.readthedocs.io/projects/open-edx-learner-guide"
+    course_author: "http://edx.readthedocs.io/projects/open-edx-building-and-running-a-course"
+# HELP_TOKENS_BOOKS obsoletes DOC_LINK_BASE_URL. These will be removed soon.
 EDXAPP_LMS_DOC_LINK_BASE_URL: 'https://edx.readthedocs.io/projects/open-edx-learner-guide'
 EDXAPP_CMS_DOC_LINK_BASE_URL: 'https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course'
 
@@ -1022,6 +1026,7 @@ generic_env_config:  &edxapp_generic_env
   ELASTIC_SEARCH_CONFIG: "{{ EDXAPP_ELASTIC_SEARCH_CONFIG }}"
   PLATFORM_TWITTER_ACCOUNT: "{{ EDXAPP_PLATFORM_TWITTER_ACCOUNT }}"
   PLATFORM_FACEBOOK_ACCOUNT: "{{ EDXAPP_PLATFORM_FACEBOOK_ACCOUNT }}"
+  HELP_TOKENS_BOOKS: "{{ EDXAPP_HELP_TOKENS_BOOKS }}"
 
 lms_auth_config:
   <<: *edxapp_generic_auth