Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
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
edx-platform
Commits
7f0ba1b7
Commit
7f0ba1b7
authored
Nov 18, 2013
by
John Jarvis
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1690 from edx/jarv/static-url
allow override for STATIC_URL
parents
e1cc87c8
5ec77010
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
cms/envs/aws.py
+3
-0
lms/envs/aws.py
+3
-0
No files found.
cms/envs/aws.py
View file @
7f0ba1b7
...
...
@@ -86,6 +86,9 @@ CELERY_QUEUES = {
with
open
(
CONFIG_ROOT
/
CONFIG_PREFIX
+
"env.json"
)
as
env_file
:
ENV_TOKENS
=
json
.
load
(
env_file
)
# STATIC_URL specifies the url to use for static files
STATIC_URL
=
ENV_TOKENS
.
get
(
'STATIC_URL'
,
STATIC_URL
)
# STATIC_ROOT specifies the directory where static files are
# collected
...
...
lms/envs/aws.py
View file @
7f0ba1b7
...
...
@@ -108,6 +108,9 @@ STATIC_ROOT_BASE = ENV_TOKENS.get('STATIC_ROOT_BASE', None)
if
STATIC_ROOT_BASE
:
STATIC_ROOT
=
path
(
STATIC_ROOT_BASE
)
# STATIC_URL specifies the url to use for static files
STATIC_URL
=
ENV_TOKENS
.
get
(
'STATIC_URL'
,
STATIC_URL
)
PLATFORM_NAME
=
ENV_TOKENS
.
get
(
'PLATFORM_NAME'
,
PLATFORM_NAME
)
# For displaying on the receipt. At Stanford PLATFORM_NAME != MERCHANT_NAME, but PLATFORM_NAME is a fine default
CC_MERCHANT_NAME
=
ENV_TOKENS
.
get
(
'CC_MERCHANT_NAME'
,
PLATFORM_NAME
)
...
...
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