Commit 1acd3c05 by Joe Blaylock

Rename auth_config and env_config by service

* Rename auth_config and env_config to be specific to LMS and CMS
* Minor CMS configuration cleanups elsewhere
parent fac30bd0
{# {% do auth_config.update( { < override some hash keys > } ) %} #} {# {% do auth_config.update( { < override some hash keys > } ) %} #}
{{ auth_config | to_nice_json }} {{ cms_auth_config | to_nice_json }}
{{ env_config | to_nice_json }} {{ cms_env_config | to_nice_json }}
# variables common to the cms role, automatically loaded # variables common to the cms role, automatically loaded
# when the role is included # when the role is included
--- ---
auth_config: cms_auth_config:
'CONTENTSTORE': 'CONTENTSTORE':
'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore' 'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore'
'MODULESTORE': 'MODULESTORE':
'default': 'default':
'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore' 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore'
env_config: cms_env_config:
'CACHES': 'CACHES':
'default': 'default':
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache' 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache'
'KEY_FUNCTION': 'util.memcache.safe_key' 'KEY_FUNCTION': 'util.memcache.safe_key'
'KEY_PREFIX': 'cms.edx.org'
'LOCATION': [ "deploycache-large.foo-bar.amazonaws.com:11211" ]
'mongo_metadata_inheritance': 'mongo_metadata_inheritance':
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache' 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache'
'KEY_FUNCTION': 'util.memcache.safe_key' 'KEY_FUNCTION': 'util.memcache.safe_key'
'TIMEOUT': 300 'TIMEOUT': 300
'KEY_PREFIX': 'cms.edx.org'
'LOCATION': [ "deploycache-large.foo-bar.amazonaws.com:11211" ]
'staticfiles': 'staticfiles':
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache' 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache'
'KEY_FUNCTION': 'util.memcache.safe_key' 'KEY_FUNCTION': 'util.memcache.safe_key'
'KEY_PREFIX': 'cms.edx.org'
'LOCATION': [ "deploycache-large.foo-bar.amazonaws.com:11211" ]
'LOG_DIR': '/mnt/logs/edx' 'LOG_DIR': '/mnt/logs/edx'
'LOGGING_ENV': 'lms-dev' 'LOGGING_ENV': 'cms-dev'
'SITE_NAME': 'studio.lms-dev.m.edx.org' 'SITE_NAME': 'studio.cms-dev.m.edx.org'
'SYSLOG_SERVER': 'syslog.a.m.i4x.org' 'SYSLOG_SERVER': 'syslog.a.m.i4x.org'
'LMS_BASE': 'lms-dev.m.edx.org' 'LMS_BASE': 'cms-dev.m.edx.org'
'SESSION_COOKIE_DOMAIN': '.lms-dev.m.edx.org' 'SESSION_COOKIE_DOMAIN': '.cms-dev.m.edx.org'
{{ auth_config | to_nice_json }} {{ lms_auth_config | to_nice_json }}
{{ env_config | to_nice_json }} {{ lms_env_config | to_nice_json }}
# variables common to the lms role, automatically loaded # variables common to the lms role, automatically loaded
# when the role is included # when the role is included
--- ---
auth_config: lms_auth_config:
'CONTENTSTORE': 'CONTENTSTORE':
'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore' 'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore'
'MODULESTORE': 'MODULESTORE':
'default': 'default':
'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore' 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore'
env_config: lms_env_config:
'CACHES': 'CACHES':
'default': 'default':
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache' 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache'
......
...@@ -64,7 +64,6 @@ server { ...@@ -64,7 +64,6 @@ server {
auth_basic "Restricted"; auth_basic "Restricted";
auth_basic_user_file /etc/nginx/nginx.htpasswd; auth_basic_user_file /etc/nginx/nginx.htpasswd;
root {{app_base_dir}}; root {{app_base_dir}};
try_files /staticfiles/$file /course_static/$file =404;
# return a 403 for static files that shouldn't be # return a 403 for static files that shouldn't be
# in the staticfiles directory # in the staticfiles directory
......
--- ---
auth_config: lms_auth_config:
'DATABASES': 'DATABASES':
'default': { 'ENGINE': 'custom', 'default': { 'ENGINE': 'custom',
'HOST': 'custom', 'NAME': 'custom', 'HOST': 'custom', 'NAME': 'custom',
......
--- ---
auth_config: lms_auth_config:
'ANALYTICS_API_KEY': 'hidden-prod' 'ANALYTICS_API_KEY': 'hidden-prod'
'AWS_ACCESS_KEY_ID': 'hidden-prod' 'AWS_ACCESS_KEY_ID': 'hidden-prod'
'AWS_SECRET_ACCESS_KEY': 'hidden-prod' 'AWS_SECRET_ACCESS_KEY': 'hidden-prod'
...@@ -39,7 +39,7 @@ auth_config: ...@@ -39,7 +39,7 @@ auth_config:
'username': 'hidden-prod'} 'username': 'hidden-prod'}
'url': 'hidden-prod' 'url': 'hidden-prod'
env_config: lms_env_config:
'SYSLOG_SERVER': 'hidden-prod' 'SYSLOG_SERVER': 'hidden-prod'
'SITE_NAME': 'hidden-prod' 'SITE_NAME': 'hidden-prod'
'LOG_DIR': 'hidden-prod' 'LOG_DIR': 'hidden-prod'
......
--- ---
auth_config: lms_auth_config:
'ANALYTICS_API_KEY': 'hidden-stage' 'ANALYTICS_API_KEY': 'hidden-stage'
'AWS_ACCESS_KEY_ID': 'hidden-stage' 'AWS_ACCESS_KEY_ID': 'hidden-stage'
'AWS_SECRET_ACCESS_KEY': 'hidden-stage' 'AWS_SECRET_ACCESS_KEY': 'hidden-stage'
...@@ -39,7 +39,7 @@ auth_config: ...@@ -39,7 +39,7 @@ auth_config:
'username': 'hidden-stage'} 'username': 'hidden-stage'}
'url': 'hidden-stage' 'url': 'hidden-stage'
env_config: lms_env_config:
'SYSLOG_SERVER': 'hidden-stage' 'SYSLOG_SERVER': 'hidden-stage'
'SITE_NAME': 'hidden-stage' 'SITE_NAME': 'hidden-stage'
'LOG_DIR': 'hidden-stage' 'LOG_DIR': 'hidden-stage'
......
--- ---
auth_config: lms_auth_config:
'CONTENTSTORE': 'CONTENTSTORE':
'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore' 'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore'
'MODULESTORE': 'MODULESTORE':
'default': 'default':
'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore' 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore'
env_config: lms_env_config:
'CACHES': 'CACHES':
'default': 'default':
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache' 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache'
......
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