File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed
Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change 224224if DEPLOYMENT_BACKEND == "aws" :
225225 AWS_S3_CUSTOM_DOMAIN = urlparse (PROXY_BASE_URL ).hostname
226226 AWS_DEFAULT_ACL = "private"
227+ AWS_CLOUDFRONT_KEY = config ("AWS_CLOUDFRONT_KEY" , default = "" ).encode ("ascii" )
228+ AWS_CLOUDFRONT_KEY_ID = config ("AWS_CLOUDFRONT_KEY_ID" , default = None )
227229 STORAGES = {
228230 "default" : {
229231 "BACKEND" : "storages.backends.s3.S3Storage" ,
Original file line number Diff line number Diff line change @@ -24,9 +24,14 @@ def link(self):
2424 storage = self .photo .storage
2525
2626 try :
27- return settings . PROXY_BASE_URL + storage .url (self .photo .name , expire = 3600 )
27+ photo_link = storage .url (self .photo .name , expire = 3600 )
2828 except TypeError :
29- return settings .PROXY_BASE_URL + storage .url (self .photo .name )
29+ photo_link = storage .url (self .photo .name )
30+
31+ if settings .DEPLOYMENT_BACKEND == "local" :
32+ photo_link = settings .PROXY_BASE_URL + photo_link
33+
34+ return photo_link
3035
3136 class Meta :
3237 unique_together = ("thing" , "name" )
You can’t perform that action at this time.
0 commit comments