From: Charles Connell <charles@connells.org>
Date: Sun, 18 May 2014 22:49:52 +0000 (-0400)
Subject: Toss CLOUDFRONT_URL
X-Git-Tag: release-20150131~39^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4f2e508f99294a1be4f2b7620373ecf2d571a2a;p=oweals%2Fkarmaworld.git

Toss CLOUDFRONT_URL
---

diff --git a/.env.example b/.env.example
index 34ed386..aab7414 100644
--- a/.env.example
+++ b/.env.example
@@ -4,8 +4,7 @@ DEFAULT_FILE_STORAGE='storages.backends.s3boto.S3BotoStorage'
 AWS_ACCESS_KEY_ID='ASCIINONSENSE'
 AWS_SECRET_ACCESS_KEY='AlphaNumerics+OtherCharacters'
 AWS_STORAGE_BUCKET_NAME='bucket_name'
-CLOUDFRONT_URL='//foo.cloudfront.net/'
-CLOUDFRONT_DOMAIN='//foo.cloudfront.net/'
+CLOUDFRONT_DOMAIN='foo.cloudfront.net'
 #MTURK_HOST='mechanicalturk.amazonaws.com'
 
 GOOGLE_CLIENT_SECRETS='{"web": {"json": "goes here"} }'
diff --git a/karmaworld/settings/prod.py b/karmaworld/settings/prod.py
index 7c35492..f167b7e 100644
--- a/karmaworld/settings/prod.py
+++ b/karmaworld/settings/prod.py
@@ -128,7 +128,7 @@ AWS_HEADERS = {
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
 # S3_URL comes from karmaworld.secret.static_s3
-STATIC_URL = os.environ.get('CLOUDFRONT_URL') + AWS_LOCATION + '/'
+STATIC_URL = '//' + os.environ['CLOUDFRONT_DOMAIN'] + '/' + AWS_LOCATION + '/'
 ########## END STORAGE CONFIGURATION
 
 ########## SSL FORWARDING CONFIGURATION