summaryrefslogtreecommitdiff
path: root/papillon
diff options
context:
space:
mode:
authoretienne2010-04-08 19:38:06 +0000
committeretienne2010-04-08 19:38:06 +0000
commita56af9c9d33ef32da5492247d776ceeef867a408 (patch)
treecad267150e6c5ac524a67207c46e1b2664da62ba /papillon
parent95729368a48257b110ea33dfb005785f8ed6734f (diff)
Update the default settings to be correct with the documentation - Add the documentation file
Diffstat (limited to 'papillon')
-rw-r--r--papillon/settings.py4
-rw-r--r--papillon/urls.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/papillon/settings.py b/papillon/settings.py
index 85ae8c8..1307e24 100644
--- a/papillon/settings.py
+++ b/papillon/settings.py
@@ -6,8 +6,8 @@
DEBUG = True
TEMPLATE_DEBUG = DEBUG
-ROOT_PATH = '/var/local/django/papillon/'
-SERVER_URL = 'http://localhost:8000/'
+ROOT_PATH = '/var/local/django/papillon/papillon/'
+SERVER_URL = 'http://localhost/'
EXTRA_URL = 'papillon/'
BASE_SITE = SERVER_URL + EXTRA_URL
diff --git a/papillon/urls.py b/papillon/urls.py
index 1e35a7b..e61fc66 100644
--- a/papillon/urls.py
+++ b/papillon/urls.py
@@ -46,7 +46,7 @@ urlpatterns = patterns('',
(r'^papillon/feeds/(?P<url>.*)$',
'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
(r'^papillon/static/(?P<path>.*)$', 'django.views.static.serve',
- {'document_root': 'static/'}),
+ {'document_root': '/var/local/django/papillon/papillon/static'}),
(r'^papillon/media/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': 'media/'}),
(r'^papillon/tinymce/', include('tinymce.urls')),