Merge branch 'master' of github.com:burhan/cookiecutter-django

* 'master' of github.com:burhan/cookiecutter-django:
  fixing env. value to match documentation
  Fixing URL bug with environment values
  adding to contributors
This commit is contained in:
Burhan Khalid 2014-08-06 14:29:00 +03:00
commit 90e76d1566
2 changed files with 6 additions and 1 deletions

View File

@ -20,6 +20,7 @@ Yaroslav Halchenko
Pablo / @oubiga Pablo / @oubiga
Tom Atkins / @knitatoms Tom Atkins / @knitatoms
Julio Castillo / @juliocc Julio Castillo / @juliocc
Burhan Khalid / @burhan
* Possesses commit rights * Possesses commit rights

View File

@ -360,7 +360,11 @@ class Production(Common):
} }
# 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 # A hack to fix this, because the default __repr__ of values will return <Value Default: foo>
# if foo is the default, or whatever the value of the environment variable.
# This causes the URL to be https://s3.amazonaws.com/&lt;Value%20Default:%20foo%gt;/
# @burhan 2014-07-20
STATIC_URL = 'https://s3.amazonaws.com/%s/' % (AWS_STORAGE_BUCKET_NAME.setup('DJANGO_AWS_STORAGE_BUCKET_NAME'),)
########## END STORAGE CONFIGURATION ########## END STORAGE CONFIGURATION
########## EMAIL ########## EMAIL