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
0be9daf9
Commit
0be9daf9
authored
Oct 21, 2013
by
Carlos Andrés Rocha
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1419 from rocha/fix-config-root-env
Fix error when reading tokens on aws configuration
parents
bd812a62
b764b9b4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
cms/envs/aws.py
+2
-1
lms/envs/aws.py
+2
-1
No files found.
cms/envs/aws.py
View file @
0be9daf9
...
...
@@ -12,6 +12,7 @@ from .common import *
from
logsettings
import
get_logger_config
import
os
from
path
import
path
# SERVICE_VARIANT specifies name of the variant used, which decides what JSON
# configuration files are read during startup.
...
...
@@ -20,7 +21,7 @@ SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
# CONFIG_ROOT specifies the directory where the JSON configuration
# files are expected to be found. If not specified, use the project
# directory.
CONFIG_ROOT
=
os
.
environ
.
get
(
'CONFIG_ROOT'
,
ENV_ROOT
)
CONFIG_ROOT
=
path
(
os
.
environ
.
get
(
'CONFIG_ROOT'
,
ENV_ROOT
)
)
# CONFIG_PREFIX specifies the prefix of the JSON configuration files,
# based on the service variant. If no variant is use, don't use a
...
...
lms/envs/aws.py
View file @
0be9daf9
...
...
@@ -17,6 +17,7 @@ from .common import *
from
logsettings
import
get_logger_config
import
os
from
path
import
path
# SERVICE_VARIANT specifies name of the variant used, which decides what JSON
# configuration files are read during startup.
...
...
@@ -25,7 +26,7 @@ SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None)
# CONFIG_ROOT specifies the directory where the JSON configuration
# files are expected to be found. If not specified, use the project
# directory.
CONFIG_ROOT
=
os
.
environ
.
get
(
'CONFIG_ROOT'
,
ENV_ROOT
)
CONFIG_ROOT
=
path
(
os
.
environ
.
get
(
'CONFIG_ROOT'
,
ENV_ROOT
)
)
# CONFIG_PREFIX specifies the prefix of the JSON configuration files,
# based on the service variant. If no variant is use, don't use a
...
...
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