Commit 41a5343d by John Jarvis

In the configuration hash values set to "None" will be converted to None

parent e6e6771a
...@@ -11,12 +11,16 @@ ...@@ -11,12 +11,16 @@
# #
# Defaults specified here should not contain # Defaults specified here should not contain
# any secrets or host identifying information. # any secrets or host identifying information.
#
# Variables set to "None" will be converted to None
# when the edxapp config is written to disk.
EDXAPP_LMS_BASE: '' EDXAPP_LMS_BASE: ""
EDXAPP_PREVIEW_LMS_BASE: '' EDXAPP_PREVIEW_LMS_BASE: ""
EDXAPP_CMS_BASE: '' EDXAPP_CMS_BASE: ""
EDXAPP_AWS_ACCESS_KEY_ID: '' EDXAPP_AWS_ACCESS_KEY_ID: ""
EDXAPP_AWS_SECRET_ACCESS_KEY: '' EDXAPP_AWS_SECRET_ACCESS_KEY: ""
EDXAPP_XQUEUE_BASIC_AUTH: [ "{{ COMMON_HTPASSWD_USER }}", "{{ COMMON_HTPASSWD_PASS }}" ] EDXAPP_XQUEUE_BASIC_AUTH: [ "{{ COMMON_HTPASSWD_USER }}", "{{ COMMON_HTPASSWD_PASS }}" ]
EDXAPP_XQUEUE_DJANGO_AUTH: EDXAPP_XQUEUE_DJANGO_AUTH:
username: 'lms' username: 'lms'
...@@ -52,17 +56,17 @@ EDXAPP_MEMCACHE: [ 'localhost:11211' ] ...@@ -52,17 +56,17 @@ EDXAPP_MEMCACHE: [ 'localhost:11211' ]
EDXAPP_COMMENTS_SERVICE_URL: 'http://localhost:18080' EDXAPP_COMMENTS_SERVICE_URL: 'http://localhost:18080'
EDXAPP_COMMENTS_SERVICE_KEY: 'password' EDXAPP_COMMENTS_SERVICE_KEY: 'password'
EDXAPP_EDXAPP_SECRET_KEY: '' EDXAPP_EDXAPP_SECRET_KEY: ""
EDXAPP_OEE_URL: 'http://localhost:18060/' EDXAPP_OEE_URL: 'http://localhost:18060/'
EDXAPP_OEE_USER: 'lms' EDXAPP_OEE_USER: 'lms'
EDXAPP_OEE_PASSWORD: 'password' EDXAPP_OEE_PASSWORD: 'password'
EDXAPP_ANALYTICS_API_KEY: '' EDXAPP_ANALYTICS_API_KEY: ""
EDXAPP_PAYMENT_SUPPORT_EMAIL: "billing@example.com" EDXAPP_PAYMENT_SUPPORT_EMAIL: "billing@example.com"
EDXAPP_ZENDESK_USER: '' EDXAPP_ZENDESK_USER: ""
EDXAPP_ZENDESK_URL: '' EDXAPP_ZENDESK_URL: ""
EDXAPP_ZENDESK_API_KEY: '' EDXAPP_ZENDESK_API_KEY: ""
EDXAPP_CELERY_USER: 'celery' EDXAPP_CELERY_USER: 'celery'
EDXAPP_CELERY_PASSWORD: 'celery' EDXAPP_CELERY_PASSWORD: 'celery'
...@@ -71,10 +75,10 @@ EDXAPP_VIDEO_CDN_URLS: ...@@ -71,10 +75,10 @@ EDXAPP_VIDEO_CDN_URLS:
EDXAPP_PLATFORM_NAME: 'Your Platform Name Here' EDXAPP_PLATFORM_NAME: 'Your Platform Name Here'
EDXAPP_CAS_SERVER_URL: '' EDXAPP_CAS_SERVER_URL: ""
EDXAPP_CAS_EXTRA_LOGIN_PARAMS: '' EDXAPP_CAS_EXTRA_LOGIN_PARAMS: ""
EDXAPP_CAS_ATTRIBUTE_CALLBACK: '' EDXAPP_CAS_ATTRIBUTE_CALLBACK: ""
EDXAPP_CAS_ATTRIBUTE_PACKAGE: '' EDXAPP_CAS_ATTRIBUTE_PACKAGE: ""
# Enable an end-point that creates a user and logs them in # Enable an end-point that creates a user and logs them in
# Used for performance testing # Used for performance testing
EDXAPP_ENABLE_AUTO_AUTH: false EDXAPP_ENABLE_AUTO_AUTH: false
...@@ -95,20 +99,20 @@ EDXAPP_FEATURES: ...@@ -95,20 +99,20 @@ EDXAPP_FEATURES:
AUTOMATIC_AUTH_FOR_TESTING: $EDXAPP_ENABLE_AUTO_AUTH AUTOMATIC_AUTH_FOR_TESTING: $EDXAPP_ENABLE_AUTO_AUTH
ENABLE_THIRD_PARTY_AUTH: $EDXAPP_ENABLE_THIRD_PARTY_AUTH ENABLE_THIRD_PARTY_AUTH: $EDXAPP_ENABLE_THIRD_PARTY_AUTH
EDXAPP_BOOK_URL: '' EDXAPP_BOOK_URL: ""
# This needs to be set to localhost # This needs to be set to localhost
# if xqueue is run on the same server # if xqueue is run on the same server
# as the lms (it's sent in the request) # as the lms (it's sent in the request)
EDXAPP_SITE_NAME: 'localhost' EDXAPP_SITE_NAME: 'localhost'
EDXAPP_LMS_SITE_NAME: "{{ EDXAPP_SITE_NAME }}" EDXAPP_LMS_SITE_NAME: "{{ EDXAPP_SITE_NAME }}"
EDXAPP_CMS_SITE_NAME: 'localhost' EDXAPP_CMS_SITE_NAME: 'localhost'
EDXAPP_MEDIA_URL: '' EDXAPP_MEDIA_URL: ""
EDXAPP_ANALYTICS_SERVER_URL: '' EDXAPP_ANALYTICS_SERVER_URL: ""
EDXAPP_FEEDBACK_SUBMISSION_EMAIL: '' EDXAPP_FEEDBACK_SUBMISSION_EMAIL: ""
EDXAPP_CELERY_BROKER_HOSTNAME: '' EDXAPP_CELERY_BROKER_HOSTNAME: ""
EDXAPP_LOGGING_ENV: 'sandbox' EDXAPP_LOGGING_ENV: 'sandbox'
EDXAPP_SYSLOG_SERVER: '' EDXAPP_SYSLOG_SERVER: ""
EDXAPP_RABBIT_HOSTNAME: 'localhost' EDXAPP_RABBIT_HOSTNAME: 'localhost'
EDXAPP_XML_MAPPINGS: {} EDXAPP_XML_MAPPINGS: {}
...@@ -152,11 +156,11 @@ EDXAPP_GRADE_ROOT_PATH: '/tmp/edx-s3/grades' ...@@ -152,11 +156,11 @@ EDXAPP_GRADE_ROOT_PATH: '/tmp/edx-s3/grades'
# These are the same defaults set in common.py # These are the same defaults set in common.py
EDXAPP_CC_PROCESSOR: EDXAPP_CC_PROCESSOR:
CyberSource: CyberSource:
SHARED_SECRET: '' SHARED_SECRET: ""
MERCHANT_ID: '' MERCHANT_ID: ""
SERIAL_NUMBER: '' SERIAL_NUMBER: ""
ORDERPAGE_VERSION: '7' ORDERPAGE_VERSION: '7'
PURCHASE_ENDPOINT: '' PURCHASE_ENDPOINT: ""
# does not affect verified students # does not affect verified students
EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY: ['usd', '$'] EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY: ['usd', '$']
...@@ -201,7 +205,7 @@ EDXAPP_UPDATE_STATIC_FILES_KEY: false ...@@ -201,7 +205,7 @@ EDXAPP_UPDATE_STATIC_FILES_KEY: false
EDXAPP_INSTALL_PRIVATE_REQUIREMENTS: false EDXAPP_INSTALL_PRIVATE_REQUIREMENTS: false
EDXAPP_GOOGLE_ANALYTICS_ACCOUNT: "UA-DUMMY" EDXAPP_GOOGLE_ANALYTICS_ACCOUNT: "None"
EDXAPP_PEARSON_TEST_PASSWORD: "" EDXAPP_PEARSON_TEST_PASSWORD: ""
EDXAPP_SEGMENT_IO_LMS: false EDXAPP_SEGMENT_IO_LMS: false
......
{% do cms_auth_config.update(EDXAPP_AUTH_EXTRA) %} {% do cms_auth_config.update(EDXAPP_AUTH_EXTRA) %}
{% for key, value in cms_auth_config.iteritems() %}
{% if value == 'None' %}
{% do cms_auth_config.update({key: None }) %}
{% endif %}
{% endfor %}
{{ cms_auth_config | to_nice_json }} {{ cms_auth_config | to_nice_json }}
{% do cms_env_config.update(EDXAPP_ENV_EXTRA) %} {% do cms_env_config.update(EDXAPP_ENV_EXTRA) %}
{% if EDXAPP_UPDATE_STATIC_FILES_KEY %} {% for key, value in cms_env_config.iteritems() %}
{%- do cms_env_config['CACHES']['staticfiles'].update({'KEY_PREFIX': edxapp_dynamic_cache_key}) %} {% if value == 'None' %}
{% endif %} {% do cms_env_config.update({key: None }) %}
{% endif %}
{% endfor %}
{{ cms_env_config | to_nice_json }} {{ cms_env_config | to_nice_json }}
{% do lms_auth_config.update(EDXAPP_AUTH_EXTRA) %} {% do lms_auth_config.update(EDXAPP_AUTH_EXTRA) %}
{% for key, value in lms_auth_config.iteritems() %}
{% if value == 'None' %}
{% do lms_auth_config.update({key: None }) %}
{% endif %}
{% endfor %}
{{ lms_auth_config | to_nice_json }} {{ lms_auth_config | to_nice_json }}
{% do lms_env_config.update(EDXAPP_ENV_EXTRA) %} {% do lms_env_config.update(EDXAPP_ENV_EXTRA) %}
{% if EDXAPP_UPDATE_STATIC_FILES_KEY %} {% for key, value in lms_env_config.iteritems() %}
{%- do lms_env_config['CACHES']['staticfiles'].update({'KEY_PREFIX': edxapp_dynamic_cache_key}) %} {% if value == 'None' %}
{% endif %} {% do lms_env_config.update({key: None }) %}
{% endif %}
{% endfor %}
{{ lms_env_config | to_nice_json }} {{ lms_env_config | to_nice_json }}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment