1. Markus Zapke-Gründemann
  2. django-marcador

Commits

Markus Zapke-Gründemann  committed 728e385

Updated settings.py with Django 1.5 defaults.

  • Participants
  • Parent commits 6a4452b
  • Branches default

Comments (0)

Files changed (4)

File docs/admin_syncdb.rst

View file
 :file:`mysite/settings.py`:
 
 .. literalinclude:: ../src/mysite/mysite/settings.py
-    :lines: 116-128
+    :lines: 121-133
     :emphasize-lines: 9, 12
 
 Als letzten Schritt musst du die Admin URL aktivieren, indem du die

File docs/frontend_login.rst

View file
 an:
 
 .. literalinclude:: ../src/mysite/mysite/settings.py
-    :lines: 159-161
+    :lines: 164-166
 
 .. doctest::
     :hide:

File docs/start_django_project.rst

View file
 Konfiguriere also die Datenbankverbindung ``default`` wie folgt:
 
 .. literalinclude:: ../src/mysite/mysite/settings.py
-    :lines: 15-24
+    :lines: 15-25
 
 .. doctest::
     :hide:
 Als nächstes passe Zeitzone und Sprache an:
 
 .. literalinclude:: ../src/mysite/mysite/settings.py
-    :lines: 26-34
+    :lines: 31-39
 
 .. doctest::
     :hide:
 definiert werden:
 
 .. literalinclude:: ../src/mysite/mysite/settings.py
-    :lines: 68-75, 109-114
+    :lines: 73-80, 114-119
 
 .. doctest::
     :hide:

File src/mysite/mysite/settings.py

View file
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',  # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': os.path.join(BASE_DIR, 'mysite.db'),  # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # 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.
+        # The following settings are not used with sqlite3:
+        'USER': '',
+        'PASSWORD': '',
+        'HOST': '',                      # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
+        'PORT': '',                      # Set to empty string for default.
     }
 }
 
+# Hosts/domain names that are valid for this site; required if DEBUG is False
+# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
+ALLOWED_HOSTS = []
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
+# Example: "/var/www/example.com/media/"
 MEDIA_ROOT = ''
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
+# Examples: "http://example.com/media/", "http://media.example.com/"
 MEDIA_URL = ''
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
+# Example: "/var/www/example.com/static/"
 STATIC_ROOT = ''
 
 # URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
+# Example: "http://example.com/static/", "http://static.example.com/"
 STATIC_URL = '/static/'
 
 # Additional locations of static files