Toss CLOUDFRONT_URL
authorCharles Connell <charles@connells.org>
Sun, 18 May 2014 22:49:52 +0000 (18:49 -0400)
committerCharles Connell <charles@connells.org>
Sun, 18 May 2014 22:51:28 +0000 (18:51 -0400)
.env.example
karmaworld/settings/prod.py

index 34ed386d4f871a105892d997f557b61a710366df..aab7414de688c40f6ed3a0666b593833c4c4ac3a 100644 (file)
@@ -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"} }'
index 7c3549269fcbcf033bfaeb556d79c3e304e025a5..f167b7e00947a43f5a74af04d35908367344ba2e 100644 (file)
@@ -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