From d0a91ccf3c3d3618936eec1e8f31bcebe57e2b6c Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 29 Jun 2015 00:09:50 -0400 Subject: [PATCH] making examples consistent with dev and updating readme for static files closes #441 --- .env.example | 24 ++++++++++++------------ README.md | 7 +++++++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.env.example b/.env.example index f6199fb..2156d8c 100644 --- a/.env.example +++ b/.env.example @@ -1,13 +1,13 @@ DATABASE_URL='postgres://:@:/' -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_DOMAIN='foo.cloudfront.net' +#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_DOMAIN='foo.cloudfront.net' #MTURK_HOST='mechanicalturk.amazonaws.com' -SSL_REDIRECT=true +#SSL_REDIRECT=true GOOGLE_SERVICE_EMAIL='numbers-alphanumerics@developer.gserviceaccount.com' GOOGLE_USER='Google@Email.Address' @@ -16,8 +16,8 @@ GOOGLE_SERVICE_KEY_BASE64='Base64EncodedP12FileContentsGoHere' FILEPICKER_API_KEY='NonSeNsEAscIi' FILEPICKER_SECRET='MORENONSENSEASCII' -INDEXDEN_PRIVATE_URL='http://:@.api.indexden.com' -INDEXDEN_INDEX='index_name' +#INDEXDEN_PRIVATE_URL='http://:@.api.indexden.com' +#INDEXDEN_INDEX='index_name' CELERY_QUEUE_NAME='karmanotes_celery' @@ -29,12 +29,12 @@ CELERY_QUEUE_NAME='karmanotes_celery' DJANGO_SETTINGS_MODULE='karmaworld.settings.dev' #DJANGO_SETTINGS_MODULE='karmaworld.settings.prod' -BUILDPACK_URL='https://github.com/FinalsClub/heroku-buildpack-karmanotes' +#BUILDPACK_URL='https://github.com/FinalsClub/heroku-buildpack-karmanotes' #NEW_RELIC_APP_NAME='name' #NEW_RELIC_LICENSE_KEY='hexademicalstring' #NEW_RELIC_LOG='stdout' -SMTP_HOST='smtp.example.com' -SMTP_USERNAME='username' -SMTP_PASWORD='password' +#SMTP_HOST='smtp.example.com' +#SMTP_USERNAME='username' +#SMTP_PASWORD='password' diff --git a/README.md b/README.md index dade159..73fbefa 100644 --- a/README.md +++ b/README.md @@ -438,6 +438,13 @@ desired. * `fetching_usde_csv` requires `7zip` to be installed for processing compressed archives. On Debian-based systems, this entails `apt-get install p7zip-full` +If using `DJANGO_SETTINGS_MODULE='karmaworld.settings.dev'` in `.env`, static +file hosting is done by local files and completely ignores the +`DEFAULT_FILE_STORAGE` setting in `.env`. + +If using `DJANGO_SETTINGS_MODULE='karmaworld.settings.prod'` in `.env`, static +file hosting is done by `DEFAULT_FILE_STORAGE` defined in `.env`. + ## Run Make sure you are inside your virtual environment (`source venv/bin/activate`). -- 2.25.1