From 393780b3f17168e51ed33927eda893c2fe1cdc9d Mon Sep 17 00:00:00 2001 From: Burhan Khalid Date: Fri, 11 Jul 2014 02:41:54 +0300 Subject: [PATCH 1/3] adding to contributors --- CONTRIBUTORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 42f2fac76..5b6936ffd 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -20,6 +20,7 @@ Yaroslav Halchenko Pablo / @oubiga Tom Atkins / @knitatoms Julio Castillo / @juliocc +Burhan Khalid / @burhan * Possesses commit rights From c8ee217dd72ec29ccea4f683d83ca7438247461c Mon Sep 17 00:00:00 2001 From: Burhan Khalid Date: Sun, 20 Jul 2014 22:04:26 +0300 Subject: [PATCH 2/3] Fixing URL bug with environment values --- .../{{cookiecutter.project_name}}/config/settings.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py index 872b78075..590def49f 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py @@ -360,7 +360,11 @@ class Production(Common): } # 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 + # if foo is the default, or whatever the value of the environment variable. + # This causes the URL to be https://s3.amazonaws.com/<Value%20Default:%20foo%gt;/ + # @burhan 2014-07-20 + STATIC_URL = 'https://s3.amazonaws.com/%s/' % (AWS_STORAGE_BUCKET_NAME.setup('DJANGO_AWS_BUCKET_NAME'),) ########## END STORAGE CONFIGURATION ########## EMAIL From 4bf90c08ee07007a4d053c2a19499e1516777ba7 Mon Sep 17 00:00:00 2001 From: Burhan Khalid Date: Sun, 20 Jul 2014 22:15:46 +0300 Subject: [PATCH 3/3] fixing env. value to match documentation --- .../{{cookiecutter.project_name}}/config/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py index 590def49f..fb8ba3b76 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/config/settings.py @@ -364,7 +364,7 @@ class Production(Common): # if foo is the default, or whatever the value of the environment variable. # This causes the URL to be https://s3.amazonaws.com/<Value%20Default:%20foo%gt;/ # @burhan 2014-07-20 - STATIC_URL = 'https://s3.amazonaws.com/%s/' % (AWS_STORAGE_BUCKET_NAME.setup('DJANGO_AWS_BUCKET_NAME'),) + STATIC_URL = 'https://s3.amazonaws.com/%s/' % (AWS_STORAGE_BUCKET_NAME.setup('DJANGO_AWS_STORAGE_BUCKET_NAME'),) ########## END STORAGE CONFIGURATION ########## EMAIL