From f92de2f17f083fe9553e436908b6b17251b89610 Mon Sep 17 00:00:00 2001 From: Charles Connell Date: Fri, 25 Apr 2014 10:05:15 -0400 Subject: [PATCH] Keeping settings/vmdev.py up to speed --- karmaworld/settings/dev.py | 4 ---- karmaworld/settings/prod.py | 1 - karmaworld/settings/vmdev.py | 12 ++++++------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/karmaworld/settings/dev.py b/karmaworld/settings/dev.py index 30c8378..01a9e3f 100644 --- a/karmaworld/settings/dev.py +++ b/karmaworld/settings/dev.py @@ -84,10 +84,6 @@ INTERNAL_IPS = ('127.0.0.1',) MIDDLEWARE_CLASSES += ( 'debug_toolbar.middleware.DebugToolbarMiddleware', ) - -DEBUG_TOOLBAR_CONFIG = { - 'INTERCEPT_REDIRECTS': False # Don't interrput our redirects! -} ########## END TOOLBAR CONFIGURATION ########## COMPRESSION CONFIGURATION diff --git a/karmaworld/settings/prod.py b/karmaworld/settings/prod.py index 88462ab..bd63ab7 100644 --- a/karmaworld/settings/prod.py +++ b/karmaworld/settings/prod.py @@ -165,7 +165,6 @@ COMPRESS_CLOSURE_COMPILER_BINARY = 'java -jar /usr/bin/compiler.jar' # Links generated by compress are valid for about ten years AWS_QUERYSTRING_EXPIRE = 60 * 60 * 24 * 365 * 10 - ########## END COMPRESSION CONFIGURATION diff --git a/karmaworld/settings/vmdev.py b/karmaworld/settings/vmdev.py index 2d873fd..33b99bd 100644 --- a/karmaworld/settings/vmdev.py +++ b/karmaworld/settings/vmdev.py @@ -158,13 +158,17 @@ COMPRESS_STORAGE = DEFAULT_FILE_STORAGE # See: http://django_compressor.readthedocs.org/en/latest/settings/#django.conf.settings.COMPRESS_CSS_FILTERS COMPRESS_CSS_FILTERS += [ - 'compressor.filters.cssmin.CSSMinFilter', + 'compressor.filters.css_default.CssAbsoluteFilter', ] # See: http://django_compressor.readthedocs.org/en/latest/settings/#django.conf.settings.COMPRESS_JS_FILTERS COMPRESS_JS_FILTERS += [ - 'compressor.filters.jsmin.JSMinFilter', + 'compressor.filters.closure.ClosureCompilerFilter', ] +COMPRESS_CLOSURE_COMPILER_BINARY = 'java -jar /usr/bin/compiler.jar' + +# Links generated by compress are valid for about ten years +AWS_QUERYSTRING_EXPIRE = 60 * 60 * 24 * 365 * 10 ########## END COMPRESSION CONFIGURATION @@ -201,8 +205,4 @@ INTERNAL_IPS = ('127.0.0.1',) MIDDLEWARE_CLASSES += ( 'debug_toolbar.middleware.DebugToolbarMiddleware', ) - -DEBUG_TOOLBAR_CONFIG = { - 'INTERCEPT_REDIRECTS': False # Don't interrput our redirects! -} ########## END TOOLBAR CONFIGURATION -- 2.25.1