summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/bin/django-admin.py1
-rw-r--r--django/conf/project_template/settings/main.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/django/bin/django-admin.py b/django/bin/django-admin.py
index f6950dbf06..ca4eb99e51 100644
--- a/django/bin/django-admin.py
+++ b/django/bin/django-admin.py
@@ -271,6 +271,7 @@ def init():
cursor = db.db.cursor()
for sql in get_sql_create(core) + get_sql_create(auth) + get_sql_initial_data(core) + get_sql_initial_data(auth):
cursor.execute(sql)
+ cursor.execute("INSERT INTO %s (domain, name) VALUES ('mysite.com', 'My Django site')" % core.Site._meta.db_table)
except Exception, e:
sys.stderr.write("Error: The database couldn't be initialized. Here's the full exception:\n%s\n" % e)
db.db.rollback()
diff --git a/django/conf/project_template/settings/main.py b/django/conf/project_template/settings/main.py
index eb4c5dbc3f..b59ff74059 100644
--- a/django/conf/project_template/settings/main.py
+++ b/django/conf/project_template/settings/main.py
@@ -16,6 +16,8 @@ DATABASE_USER = ''
DATABASE_PASSWORD = ''
DATABASE_HOST = '' # Set to empty string for localhost
+SITE_ID = 1
+
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
MEDIA_ROOT = ''