From f113d90043b4844abb8a3ba3fdd325254281d048 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 22 Mar 2013 16:33:05 -0500 Subject: Reports: Fix deprecated Django settings (reported by jonten) Signed-off-by: Sol Jerome --- src/lib/Bcfg2/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/settings.py') diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index 9e6a815c7..1ffeb2056 100644 --- a/src/lib/Bcfg2/settings.py +++ b/src/lib/Bcfg2/settings.py @@ -32,7 +32,7 @@ TIME_ZONE = None DEBUG = False TEMPLATE_DEBUG = DEBUG -MEDIA_URL = '/site_media' +MEDIA_URL = '/site_media/' def _default_config(): @@ -144,7 +144,7 @@ MEDIA_ROOT = '' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. -ADMIN_MEDIA_PREFIX = '/media/' +STATIC_URL = '/media/' #TODO - make this unique # Make this unique, and don't share it with anybody. -- cgit v1.2.3-1-g7c22 From dc5ec0f8899f2a15aea34468899b7b9237874828 Mon Sep 17 00:00:00 2001 From: Jon Norman Date: Sat, 23 Mar 2013 21:20:32 +0100 Subject: Added trailing / on MEDIA_URL to get rid of deprecated warnings --- src/lib/Bcfg2/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/settings.py') diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index 1ffeb2056..7d405f868 100644 --- a/src/lib/Bcfg2/settings.py +++ b/src/lib/Bcfg2/settings.py @@ -106,7 +106,7 @@ def read_config(cfile=DEFAULT_CONFIG, repo=None, quiet=False): if setup['web_prefix']: MEDIA_URL = setup['web_prefix'].rstrip('/') + MEDIA_URL else: - MEDIA_URL = '/site_media' + MEDIA_URL = '/site_media/' # initialize settings from /etc/bcfg2-web.conf or /etc/bcfg2.conf, or # set up basic defaults. this lets manage.py work in all cases -- cgit v1.2.3-1-g7c22