projects
/
oweals
/
karmaworld.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b8d8ff
)
more copy pasta synchronization
author
Bryan
<btbonval@gmail.com>
Fri, 17 Jan 2014 05:28:32 +0000
(
00:28
-0500)
committer
Bryan
<btbonval@gmail.com>
Fri, 17 Jan 2014 05:28:32 +0000
(
00:28
-0500)
karmaworld/settings/vmdev.py
patch
|
blob
|
history
diff --git
a/karmaworld/settings/vmdev.py
b/karmaworld/settings/vmdev.py
index ed7c1693446b5bae34b9170793e4675ea3043e01..caf300ad3245c73243ffff13e10d42c1d131de3b 100644
(file)
--- a/
karmaworld/settings/vmdev.py
+++ b/
karmaworld/settings/vmdev.py
@@
-126,7
+126,7
@@
INSTALLED_APPS += (
)
# See: http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#settings
)
# See: http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#settings
-STATICFILES_STORAGE = DEFAULT_FILE_STORAGE
= 'storages.backends.s3boto.S3BotoStorage'
+STATICFILES_STORAGE = DEFAULT_FILE_STORAGE
# See: http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#settings
AWS_CALLING_FORMAT = CallingFormat.SUBDOMAIN
# See: http://django-storages.readthedocs.org/en/latest/backends/amazon-S3.html#settings
AWS_CALLING_FORMAT = CallingFormat.SUBDOMAIN
@@
-140,7
+140,7
@@
AWS_HEADERS = {
}
# See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
}
# See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
-STATIC_URL =
'https://s3.amazonaws.com/%s/' % AWS_STORAGE_BUCKET_NAME
+STATIC_URL =
S3_URL
########## END STORAGE CONFIGURATION
########## END STORAGE CONFIGURATION