Permalink
Browse files

Update docs and test settings for STATIC_URL

  • Loading branch information...
1 parent 2691ff0 commit 36fbc33e7bb9ee3677d8d79e88fd8256b69b5b04 @muffinresearch muffinresearch committed Mar 26, 2013
Showing with 5 additions and 6 deletions.
  1. +0 −3 docs/settings/settings_local.dev.py
  2. +4 −2 docs/topics/install-zamboni/installation.rst
  3. +1 −1 settings_test.py
@@ -66,9 +66,6 @@
# Disables custom routing in settings.py so that tasks actually run.
CELERY_ROUTES = {}
-# paths for images, not necessary for dev
-STATIC_URL = ''
-
# Disable timeout code during development because it uses the signal module
# which can only run in the main thread. Celery uses threads in dev.
VALIDATOR_TIMEOUT = -1
@@ -298,10 +298,12 @@ Persona
-------
We use `Persona <https://login.persona.org/>`_ to log in and create accounts.
-In order for this to work you need to set ``SITE_URL`` in your local
-settings file based on how you run your dev server. Here is an example::
+In order for this to work you need to set ``SITE_URL`` and ``STATIC_URL`` in
+your local settings file based on how you run your dev server. Here is an
+example::
SITE_URL = 'http://localhost:8000'
+ STATIC_URL = SITE_URL
Create an Admin User
--------------------
View
@@ -53,8 +53,8 @@ def _polite_tmpdir():
PAYPAL_PERMISSIONS_URL = ''
-STATIC_URL = ''
SITE_URL = ''
+STATIC_URL = 'http://testserver'
MOBILE_SITE_URL = ''
MEDIA_URL = '/media/'
# Reset these URLs to the defaults so your settings_local doesn't clobber them:

0 comments on commit 36fbc33

Please sign in to comment.