summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aloha/production.py18
-rw-r--r--aloha/settings.py9
-rw-r--r--docs/course_code_names.txt1
-rw-r--r--docs/paper_course_code_eligibility.txt2
4 files changed, 15 insertions, 15 deletions
diff --git a/aloha/production.py b/aloha/production.py
index 68f1306..b101d12 100644
--- a/aloha/production.py
+++ b/aloha/production.py
@@ -3,11 +3,13 @@ from aloha.settings import *
DEBUG=False
TEMPLATE_DEBUG=DEBUG
-
-DATABASES["default"]["ENGINE"] = 'django.db.backends.mysql'
-DATABASES["default"]["NAME"] = ''
-DATABASES["default"]["USER"] = ''
-
-from aloha.local import DATABASE_PASSWORD
-# Imports DATABASE_PASSWORD from testapp/local.py that is not part of git repo
-DATABASES["default"]["PASSWORD"] = DATABASE_PASSWORD
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+ 'NAME': 'jamallotment', # Or path to database file if using sqlite3.
+ 'USER': 'jam_user', # Not used with sqlite3.
+ 'PASSWORD': 'Jam@2012Fossee', # Not used with sqlite3.
+ 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
+ 'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ }
+}
diff --git a/aloha/settings.py b/aloha/settings.py
index 9476291..de45eaa 100644
--- a/aloha/settings.py
+++ b/aloha/settings.py
@@ -7,8 +7,7 @@ DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
- ('Primal Pappachan', 'primal@fossee.in'),
- ('Parth Buch', 'parth.buch.115@gmail.com'),
+ ('JAM Admissions 2012', 'gate3@iitb.ac.in'),
)
AUTHORS = (
@@ -172,9 +171,9 @@ EMAIL_HOST = 'smtp-auth.iitb.ac.in'
EMAIL_PORT = '25'
# Optional SMTP authentication information for EMAIL_HOST.
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_USE_TLS = False
+EMAIL_HOST_USER = 'gate3'
+EMAIL_HOST_PASSWORD = 'inter7384'
+EMAIL_USE_TLS = True
diff --git a/docs/course_code_names.txt b/docs/course_code_names.txt
index a576df1..48f576f 100644
--- a/docs/course_code_names.txt
+++ b/docs/course_code_names.txt
@@ -27,7 +27,6 @@
405:M.Sc.-Ph.D. Dual Degree in Physics:IIT Kanpur
501:Joint M.Sc.-Ph.D. Programme in Chemistry:IIT Kharagpur
502:Joint M.Sc.-Ph.D. Programme in Geology:IIT Kharagpur
-503:Joint M.Sc.-Ph.D. Programme in Geophysics:IIT Kharagpur
504:Joint M.Sc.-Ph.D. Programme in Mathematics:IIT Kharagpur
505:Joint M.Sc.-Ph.D. Programme in Physics:IIT Kharagpur
601:M.Sc. Chemistry (4 Semesters):IIT Madras
diff --git a/docs/paper_course_code_eligibility.txt b/docs/paper_course_code_eligibility.txt
index 4f8c8e1..5b5009b 100644
--- a/docs/paper_course_code_eligibility.txt
+++ b/docs/paper_course_code_eligibility.txt
@@ -2,7 +2,7 @@ BT:104:110:113:703
CA:709
CY:105:111:112:113:201:301:401:501:601:704:801
GG:101:108:502:701:707
-GP:102:109:503:708
+GP:102:109:708
MA:106:112:113:114:202:302:402:504:602:702:705
MS:103:114:404
PH:107:112:113:115:116:203:303:403:405:505:603:706:802