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
762645bf
Unverified
Commit
762645bf
authored
7 years ago
by
Matjaz Gregoric
Committed by
GitHub
7 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4200 from open-craft/mtyaka/lms-internal-root-url
Add support for LMS_INTERNAL_ROOT_URL.
parents
a0132129
bdef6211
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
CHANGELOG.md
+3
-0
playbooks/roles/edxapp/defaults/main.yml
+4
-2
No files found.
CHANGELOG.md
View file @
762645bf
-
Role: edxapp
-
Added
`EDXAPP_LMS_INTERNAL_ROOT_URL`
setting (defaults to
`EDXAPP_LMS_ROOT_URL`
).
-
Role: edxapp
-
Added
`EDXAPP_CELERY_BROKER_TRANSPORT`
and renamed
`EDXAPP_RABBIT_HOSTNAME`
to
`EDXAPP_CELERY_BROKER_HOSTNAME`
. This is to support non-amqp brokers,
specifically redis. If
`EDXAPP_CELERY_BROKER_HOSTNAME`
is unset it will use
...
...
This diff is collapsed.
Click to expand it.
playbooks/roles/edxapp/defaults/main.yml
View file @
762645bf
...
...
@@ -336,6 +336,7 @@ EDXAPP_BULK_EMAIL_LOG_SENT_EMAILS: false
EDXAPP_UNIVERSITY_EMAIL
:
'
university@example.com'
EDXAPP_PRESS_EMAIL
:
'
press@example.com'
EDXAPP_LMS_ROOT_URL
:
"
{{
EDXAPP_LMS_BASE_SCHEME
|
default('https')
}}://{{
EDXAPP_LMS_BASE
}}"
EDXAPP_LMS_INTERNAL_ROOT_URL
:
"
{{
EDXAPP_LMS_ROOT_URL
}}"
EDXAPP_LMS_ISSUER
:
"
{{
COMMON_JWT_ISSUER
}}"
EDXAPP_JWT_EXPIRATION
:
30
# Number of seconds until expiration
EDXAPP_JWT_AUDIENCE
:
"
{{
COMMON_JWT_AUDIENCE
}}"
...
...
@@ -738,7 +739,7 @@ EDXAPP_BLOCK_STRUCTURES_SETTINGS:
TASK_MAX_RETRIES
:
5
# Configuration settings needed for the LMS to communicate with the Enterprise service.
EDXAPP_ENTERPRISE_API_URL
:
"
{{
EDXAPP_LMS_ROOT_URL
}}/enterprise/api/v1"
EDXAPP_ENTERPRISE_API_URL
:
"
{{
EDXAPP_LMS_
INTERNAL_
ROOT_URL
}}/enterprise/api/v1"
EDXAPP_ENTERPRISE_SERVICE_WORKER_EMAIL
:
"
enterprise_worker@example.com"
EDXAPP_ENTERPRISE_SERVICE_WORKER_USERNAME
:
"
enterprise_worker"
...
...
@@ -747,7 +748,7 @@ EDXAPP_ENTERPRISE_COURSE_ENROLLMENT_AUDIT_MODES:
-
audit
-
honor
EDXAPP_ENTERPRISE_ENROLLMENT_API_URL
:
"
{{
EDXAPP_LMS_ROOT_URL
}}/api/enrollment/v1/"
EDXAPP_ENTERPRISE_ENROLLMENT_API_URL
:
"
{{
EDXAPP_LMS_
INTERNAL_
ROOT_URL
}}/api/enrollment/v1/"
# The default value of this needs to be a 16 character string
EDXAPP_ENTERPRISE_REPORTING_SECRET
:
'
0000000000000000'
...
...
@@ -1015,6 +1016,7 @@ generic_env_config: &edxapp_generic_env
LMS_BASE
:
"
{{
EDXAPP_LMS_BASE
}}"
CMS_BASE
:
"
{{
EDXAPP_CMS_BASE
}}"
LMS_ROOT_URL
:
"
{{
EDXAPP_LMS_ROOT_URL
}}"
LMS_INTERNAL_ROOT_URL
:
"
{{
EDXAPP_LMS_INTERNAL_ROOT_URL
}}"
PARTNER_SUPPORT_EMAIL
:
"
{{
EDXAPP_PARTNER_SUPPORT_EMAIL
}}"
PLATFORM_NAME
:
"
{{
EDXAPP_PLATFORM_NAME
}}"
PLATFORM_DESCRIPTION
:
"
{{
EDXAPP_PLATFORM_DESCRIPTION
}}"
...
...
This diff is collapsed.
Click to expand it.
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