summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-11-08 20:55:38 +0100
committerDan McGee <dan@archlinux.org>2011-11-08 20:55:38 +0100
commit886630dd4e65a7be6d1bd3d8a0e70ab24e5affc6 (patch)
tree6022547f146db5487fdc09c5d93e2b9b726befa2
parent28f72db7be7bf2f54d734c78422e6179f0ce29f1 (diff)
downloadarchweb-886630dd4e65a7be6d1bd3d8a0e70ab24e5affc6.tar.gz
archweb-886630dd4e65a7be6d1bd3d8a0e70ab24e5affc6.tar.xz
Always use same URL for both secure and non-secure CDN requests
Use a scheme-relative URL rather than serving different content to users based on HTTP or HTTPS. Should prevent mismatched certificate errors. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--local_settings.py.example5
-rw-r--r--main/templatetags/cdn.py7
2 files changed, 3 insertions, 9 deletions
diff --git a/local_settings.py.example b/local_settings.py.example
index beb48f8..bad0392 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -53,8 +53,7 @@ SECRET_KEY = '00000000000000000000000000000000000000000000000'
## CDN settings
CDN_ENABLED = False
-CDN_PATH = 'http://example.com/path/'
-CDN_PATH_SECURE = 'https://example.com/path/'
-
+# Scheme-relative URL, should work for both http/https
+CDN_PATH = '//example.com/path/'
# vim: set ts=4 sw=4 et:
diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py
index c25040c..5cb12fc 100644
--- a/main/templatetags/cdn.py
+++ b/main/templatetags/cdn.py
@@ -23,12 +23,7 @@ class CDNPrefixNode(template.Node):
oncdn = getattr(settings, 'CDN_ENABLED', True)
if not oncdn:
return ''
- secure = 'secure' in context and context['secure']
# if left undefined, same behavior as if CDN is turned off
- paths = {
- False: getattr(settings, 'CDN_PATH', ''),
- True: getattr(settings, 'CDN_PATH_SECURE', ''),
- }
- return paths[secure]
+ return getattr(settings, 'CDN_PATH', '')
# vim: set ts=4 sw=4 et: