equal
deleted
inserted
replaced
1 #django |
1 #django |
2 from project.settings import * |
2 from project.settings import * |
3 |
3 |
4 SITE_ID = 2 |
4 DEBUG=True |
|
5 TEMPLATE_DEBUG=DEBUG |
|
6 |
|
7 SITE_ID = 1 |
5 |
8 |
6 INSTALLED_APPS = ( |
9 INSTALLED_APPS = ( |
7 'django.contrib.auth', |
10 'django.contrib.auth', |
8 'django.contrib.contenttypes', |
11 'django.contrib.contenttypes', |
9 'django.contrib.comments', |
12 'django.contrib.comments', |
21 'basic.blog', |
24 'basic.blog', |
22 'basic.inlines', |
25 'basic.inlines', |
23 'basic.media', |
26 'basic.media', |
24 'django_extensions', |
27 'django_extensions', |
25 'south', |
28 'south', |
|
29 'registration', |
26 ) |
30 ) |
27 |
31 |
28 DATABASE_ENGINE = 'postgresql_psycopg2' |
32 DATABASE_ENGINE = 'mysql' |
29 DATABASE_NAME = 'kpc09' |
33 DATABASE_NAME = 'conference2009' |
30 DATABASE_USER = 'kpc09' |
34 DATABASE_USER = 'root' |
31 # Imports DATABASE_PASSWORD from project/local.py that is not part of mercurial repo |
35 # Imports DATABASE_PASSWORD from project/local.py that is not part of mercurial repo |
32 from project.local import DATABASE_PASSWORD |
36 from project.local import DATABASE_PASSWORD |