diff options
| author | Prabhu Ramachandran | 2013-04-27 15:28:28 +0530 |
|---|---|---|
| committer | Prabhu Ramachandran | 2013-04-27 15:28:28 +0530 |
| commit | 8b6ac259503323bc3d8333382d3769e5d10f162a (patch) | |
| tree | 5d260a3db043492ef731b4241cf0f07563591743 /testapp/production.py | |
| parent | fd044e4a9f08366c9425cb241b7452da2ba904e1 (diff) | |
| parent | 5c7f66806e4be50985655b7c12bf3190ee91ae46 (diff) | |
| download | online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.tar.gz online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.tar.bz2 online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.zip | |
Merge branch 'model_changes' of ...
https://github.com/hardythe1/online_test into master.
Conflicts:
production.cfg
testapp/production.py
Diffstat (limited to 'testapp/production.py')
| -rw-r--r-- | testapp/production.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/testapp/production.py b/testapp/production.py index f4d88e2..312e838 100644 --- a/testapp/production.py +++ b/testapp/production.py @@ -4,3 +4,8 @@ DEBUG=False TEMPLATE_DEBUG=DEBUG from testapp.local import * +DATABASE_ENGINE = 'django.db.backends.mysql' +DATABASE_NAME = 'online_test' +DATABASE_USER = 'online_test_user' +# Imports DATABASE_PASSWORD from testapp/local.py that is not part of git repo +from testapp.local import DATABASE_PASSWORD |