Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
538cfcd4
Commit
538cfcd4
authored
Aug 28, 2014
by
Fred Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow auth_extra override for CMS/LMS independently
parent
f1407cd5
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
CHANGELOG.md
+4
-0
playbooks/roles/edxapp/defaults/main.yml
+2
-0
playbooks/roles/edxapp/templates/cms.auth.json.j2
+1
-1
playbooks/roles/edxapp/templates/lms.auth.json.j2
+1
-1
No files found.
CHANGELOG.md
View file @
538cfcd4
...
...
@@ -29,3 +29,7 @@
-
Role: Mongo
-
Fixed case of variable used in if block that breaks cluster configuration
by changing mongo_clustered to MONGO_CLUSTERED.
-
Role: Edxapp
-
Added EDXAPP_LMS_AUTH_EXTRA and EDXAPP_CMS_AUTH_EXTRA for passing unique AUTH_EXTRA configurations to the LMS and CMS.
Both variables default to EDXAPP_AUTH_EXTRA for backward compatibility
playbooks/roles/edxapp/defaults/main.yml
View file @
538cfcd4
...
...
@@ -159,6 +159,8 @@ EDXAPP_PLATFORM_FACEBOOK_ACCOUNT: 'http://www.facebook.com/YourPlatformFacebookA
EDXAPP_ENV_EXTRA
:
{}
EDXAPP_AUTH_EXTRA
:
{}
EDXAPP_LMS_AUTH_EXTRA
:
"
{{
EDXAPP_AUTH_EXTRA
}}"
EDXAPP_CMS_AUTH_EXTRA
:
"
{{
EDXAPP_AUTH_EXTRA
}}"
EDXAPP_ENABLE_MKTG_SITE
:
false
EDXAPP_MKTG_URL_LINK_MAP
:
{}
EDXAPP_MKTG_URLS
:
{}
...
...
playbooks/roles/edxapp/templates/cms.auth.json.j2
View file @
538cfcd4
{% do cms_auth_config.update(EDXAPP_AUTH_EXTRA) %}
{% do cms_auth_config.update(EDXAPP_
CMS_
AUTH_EXTRA) %}
{% for key, value in cms_auth_config.iteritems() %}
{% if value == 'None' %}
{% do cms_auth_config.update({key: None }) %}
...
...
playbooks/roles/edxapp/templates/lms.auth.json.j2
View file @
538cfcd4
{% do lms_auth_config.update(EDXAPP_AUTH_EXTRA) %}
{% do lms_auth_config.update(EDXAPP_
LMS_
AUTH_EXTRA) %}
{% for key, value in lms_auth_config.iteritems() %}
{% if value == 'None' %}
{% do lms_auth_config.update({key: None }) %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment