diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-25 10:06:56 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-25 10:06:56 -0400 |
| commit | aacbd15de9d6985dba876337547d73fb4cabfacb (patch) | |
| tree | c5ffc47a8d8a19078033728b98abbc3619c7fe99 /src/lib/Bcfg2/settings.py | |
| parent | 6987584150cb9bcc8b178f1e714339f74669345b (diff) | |
| parent | fe7a3e9c7a7d66cccbd825465cefcf88165a0c3a (diff) | |
| download | bcfg2-aacbd15de9d6985dba876337547d73fb4cabfacb.tar.gz bcfg2-aacbd15de9d6985dba876337547d73fb4cabfacb.tar.bz2 bcfg2-aacbd15de9d6985dba876337547d73fb4cabfacb.zip | |
Merge branch 'maint'
Diffstat (limited to 'src/lib/Bcfg2/settings.py')
| -rw-r--r-- | src/lib/Bcfg2/settings.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/settings.py b/src/lib/Bcfg2/settings.py index 708bc59b2..de2ef5960 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(): @@ -98,7 +98,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 @@ -136,7 +136,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. |