Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1419 from rocha/fix-config-root-env

Browse Source 
Fix error when reading tokens on aws configuration
This commit is contained in:
Carlos Andrés Rocha
2013-10-21 08:24:15 -07:00
parent bd812a62b7 b764b9b4cf
commit 0be9daf9d5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cms/envs/aws.py
View File

@@ -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

3
lms/envs/aws.py
View File

@@ -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