From e84c31852aae3d1c79fe3cbb1aea2ca9646197ef Mon Sep 17 00:00:00 2001 From: Guilherme Salgado Date: Mon, 28 Feb 2011 02:38:29 +0000 Subject: settings: Remove hard-coded absolute paths This is so that you don't have to change a dozen variables when you deploy an instance somewhere other than on /srv/patchwork. Signed-off-by: Guilherme Salgado Signed-off-by: Jeremy Kerr --- apps/urls.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'apps/urls.py') diff --git a/apps/urls.py b/apps/urls.py index 14f0545..7ec5dd8 100644 --- a/apps/urls.py +++ b/apps/urls.py @@ -17,6 +17,8 @@ # along with Patchwork; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +import os + from django.conf.urls.defaults import * from django.conf import settings from patchwork.admin import admin_site @@ -24,6 +26,8 @@ from patchwork.admin import admin_site from registration.views import register from patchwork.forms import RegistrationForm +htdocs = os.path.join(settings.ROOT_DIR, 'htdocs') + urlpatterns = patterns('', # Example: (r'^', include('patchwork.urls')), @@ -39,10 +43,10 @@ urlpatterns = patterns('', (r'^admin/(.*)', admin_site.root), (r'^css/(?P.*)$', 'django.views.static.serve', - {'document_root': '/srv/patchwork/htdocs/css'}), + {'document_root': os.path.join(htdocs, 'css')}), (r'^js/(?P.*)$', 'django.views.static.serve', - {'document_root': '/srv/patchwork/htdocs/js'}), + {'document_root': os.path.join(htdocs, 'js')}), (r'^images/(?P.*)$', 'django.views.static.serve', - {'document_root': '/srv/patchwork/htdocs/images'}), + {'document_root': os.path.join(htdocs, 'images')}), ) -- cgit v1.2.3