Commit 543fe663 by Muhammad Ammar Committed by GitHub

Merge pull request #33 from edx/ammar/changes-for-config

changes for config role
parents 79a90655 0e39afa2
PACKAGES = VEDA VEDA_OS01 control frontend youtube_callback scripts PACKAGES = VEDA VEDA_OS01 control frontend youtube_callback scripts
requirements: production-requirements:
pip install -r requirements.txt pip install -r requirements.txt
requirements: production-requirements
pip install -r test_requirements.txt pip install -r test_requirements.txt
migrate:
python manage.py migrate --noinput
static:
python manage.py collectstatic --noinput
validate: test ## Run tests and quality checks validate: test ## Run tests and quality checks
test: clean test: clean
......
...@@ -23,3 +23,10 @@ DJANGO_SECRET_KEY = return_dict['django_secret_key'] or 'test_secret_key' ...@@ -23,3 +23,10 @@ DJANGO_SECRET_KEY = return_dict['django_secret_key'] or 'test_secret_key'
DJANGO_ADMIN = ('', '') DJANGO_ADMIN = ('', '')
DJANGO_DEBUG = return_dict['debug'] if 'debug' in return_dict else False DJANGO_DEBUG = return_dict['debug'] if 'debug' in return_dict else False
DATABASES = return_dict['DATABASES'] DATABASES = return_dict['DATABASES']
STATIC_ROOT_PATH = return_dict.get(
'STATIC_ROOT_PATH',
os.path.join(
os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
'static'
)
)
...@@ -44,8 +44,9 @@ USE_I18N = True ...@@ -44,8 +44,9 @@ USE_I18N = True
USE_L10N = True USE_L10N = True
USE_TZ = True USE_TZ = True
# Absolute filesystem path to the directory that will hold user-uploaded files. # Absolute filesystem path to the directory that will hold user-uploaded files.
STATIC_ROOT = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "static") STATIC_ROOT = STATIC_ROOT_PATH
STATIC_URL = '/static/' STATIC_URL = '/static/'
# Additional locations of static files # Additional locations of static files
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
DATABASES: DATABASES:
default: default:
ENGINE: 'django.db.backends.mysql' ENGINE: 'django.db.backends.mysql'
NAME: NAME: 'pipeline'
USER: USER: 'pipeline001'
PASSWORD: PASSWORD: 'password'
HOST: HOST: 'localhost'
PORT: '3306' PORT: 3306
django_secret_key: "" django_secret_key: ""
......
##
django==1.9 django==1.9
djangorestframework==3.6.4 djangorestframework==3.6.4
django-cors-headers django-cors-headers
...@@ -13,4 +12,7 @@ pyyaml ...@@ -13,4 +12,7 @@ pyyaml
requests==2.18.1 requests==2.18.1
celery==3.1.18 celery==3.1.18
pysrt==1.1.1 pysrt==1.1.1
edx-opaque-keys==0.4 edx-opaque-keys==0.4
\ No newline at end of file MySQL-python==1.2.5
gunicorn==0.17.4
gevent==1.2.2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment