Merge branch 'current_branch' into 'dev'

migrate update See merge request !16
8 years ago · 11d0c497fc
parent 2e0197a06e ba235822a7
commit 11d0c497fc
2 changed files with 3 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,4 +22,4 @@ __pycache__
 /csv/article/
 /static/
 /media/
-config_app/settings/prod.env
+config_app/settings/master.env
--- a/lms/settings.py
+++ b/lms/settings.py
@ -21,8 +21,8 @@ if MOD == 'Test':
 elif MOD == 'Dev':
    environ.Env.read_env(str(root) + '/config_app/settings/dev.env')

-elif MOD == 'Prod':
-    environ.Env.read_env(str(root) + '/config_app/settings/prod.env')
+elif MOD == 'Master':
+    environ.Env.read_env(str(root) + '/config_app/settings/master.env')

 else:
    raise ImportError('no such environ ' + MOD)