Ticket #1755: django_1755.patch

conf/project_template/settings.py

@@ -26 +26 @@
 LANGUAGE_CODE = 'en-us'
 
 SITE_ID = 1
+SITE_DOMAIN_NAME = 'example.com'
+SITE_DISPLAY_NAME = 'example.com'
 
+SUPERUSER_USERNAME = 'root'
+SUPERUSER_EMAIL = 'root@example.com'
+SUPERUSER_PASSWORD = 'password'
+
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = ''

contrib/auth/management.py

@@ -5 +5 @@
 from django.dispatch import dispatcher
 from django.db.models import get_models, signals
 from django.contrib.auth import models as auth_app
+from django.conf import settings
 
 def _get_permission_codename(action, opts):
     return '%s_%s' % (action, opts.object_name.lower())
@@ -38 +39 @@
     from django.contrib.auth.models import User
     from django.contrib.auth.create_superuser import createsuperuser as do_create
     if User in created_models:
-        msg = "\nYou just installed Django's auth system, which means you don't have " \
-                "any superusers defined.\nWould you like to create one now? (yes/no): "
-        confirm = raw_input(msg)
-        while 1:
-            if confirm not in ('yes', 'no'):
-                confirm = raw_input('Please enter either "yes" or "no": ')
-                continue
-            if confirm == 'yes':
-                do_create()
-            break
+        if settings.SUPERUSER_USERNAME and settings.SUPERUSER_EMAIL and settings.SUPERUSER_PASSWORD:
+            do_create(settings.SUPERUSER_USERNAME, settings.SUPERUSER_EMAIL, settings.SUPERUSER_PASSWORD)
 
 dispatcher.connect(create_permissions, signal=signals.post_syncdb)
 dispatcher.connect(create_superuser, sender=auth_app, signal=signals.post_syncdb)

contrib/sites/management.py

@@ -6 +6 @@
 from django.db.models import signals
 from django.contrib.sites.models import Site
 from django.contrib.sites import models as site_app
+from django.conf import settings
 
 def create_default_site(app, created_models):
     if Site in created_models:
-        print "Creating example.com Site object"
-        s = Site(domain="example.com", name="example.com")
+        print "Creating default Site object"
+        s = Site(domain=settings.SITE_DOMAIN_NAME, name=settings.SITE_DISPLAY_NAME)
         s.save()
 
 dispatcher.connect(create_default_site, sender=site_app, signal=signals.post_syncdb)