Skip to content
Merged
13 changes: 11 additions & 2 deletions configuration_files/cms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ FEATURES:
ENABLE_EXPORT_GIT: false
ENABLE_GRADE_DOWNLOADS: true
ENABLE_LTI_PROVIDER: false
ENABLE_MKTG_SITE: false
ENABLE_MKTG_SITE: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the FEATURES dict was going away and all of these were duplicated to top-level?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have fixed them and make them to their correct place

ENABLE_MOBILE_REST_API: false
ENABLE_OAUTH2_PROVIDER: false
ENABLE_PUBLISHER: false
Expand Down Expand Up @@ -382,7 +382,16 @@ LOG_DIR: /edx/var/log/edx
MAINTENANCE_BANNER_TEXT: Sample banner message
MEDIA_ROOT: /edx/var/edxapp/media/
MEDIA_URL: /media/
MKTG_URLS: {}
MKTG_URLS:
ROOT: https://www.edx.org
ABOUT: /about
CONTACT: /contact
FAQ: /help
COURSES: /course
TOS: /edx-terms-service
HONOR: /honor
PRIVACY: /privacy
WHAT_IS_VERIFIED_CERT: /verified-certificate
MKTG_URL_LINK_MAP: {}
MOBILE_STORE_ACE_URLS: {}
MODULESTORE:
Expand Down
13 changes: 11 additions & 2 deletions configuration_files/lms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ FEATURES:
ENABLE_EXPORT_GIT: false
ENABLE_GRADE_DOWNLOADS: true
ENABLE_LTI_PROVIDER: false
ENABLE_MKTG_SITE: false
ENABLE_MKTG_SITE: true
ENABLE_MOBILE_REST_API: false
ENABLE_OAUTH2_PROVIDER: false
ENABLE_PUBLISHER: false
Expand Down Expand Up @@ -422,7 +422,16 @@ MAILCHIMP_NEW_USER_LIST_ID: null
MAINTENANCE_BANNER_TEXT: Sample banner message
MEDIA_ROOT: /edx/var/edxapp/media/
MEDIA_URL: /media/
MKTG_URLS: {}
MKTG_URLS:
ROOT: https://www.edx.org
ABOUT: /about
CONTACT: /contact
FAQ: /help
COURSES: /course
TOS: /edx-terms-service
HONOR: /honor
PRIVACY: /privacy
WHAT_IS_VERIFIED_CERT: /verified-certificate
MKTG_URL_LINK_MAP: {}
MOBILE_STORE_URLS: {}
MODULESTORE:
Expand Down
2 changes: 1 addition & 1 deletion py_configuration_files/lms.py
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing
'ENABLE_ENTERPRISE_INTEGRATION': True,
})

ENABLE_MKTG_SITE = os.environ.get('ENABLE_MARKETING_SITE', False)
ENABLE_MKTG_SITE = os.environ.get('ENABLE_MARKETING_SITE', True)
MARKETING_SITE_ROOT = os.environ.get('MARKETING_SITE_ROOT', 'http://localhost:8080')

MKTG_URLS = {
Expand Down