Commit 07e9731818a22fb250ae65c77cc0e8bfa34d5695
1 parent
72bb1d5e
Exists in
master
and in
1 other branch
changing my mind again: use a config var for the s3 bucket.
Showing
2 changed files
with
2 additions
and
3 deletions
Show diff stats
config/s3.yml
@@ -13,13 +13,11 @@ | @@ -13,13 +13,11 @@ | ||
13 | development: &default | 13 | development: &default |
14 | access_key_id: <%= ENV['S3_KEY'] %> | 14 | access_key_id: <%= ENV['S3_KEY'] %> |
15 | secret_access_key: <%= ENV['S3_SECRET'] %> | 15 | secret_access_key: <%= ENV['S3_SECRET'] %> |
16 | - bucket: CHANGME_development | 16 | + bucket: <%= ENV['S3_BUCKET'] %> |
17 | 17 | ||
18 | test: | 18 | test: |
19 | <<: *default | 19 | <<: *default |
20 | - bucket: CHANGME_test | ||
21 | 20 | ||
22 | production: | 21 | production: |
23 | <<: *default | 22 | <<: *default |
24 | - bucket: CHANGME_production | ||
25 | 23 |
lib/tasks/heroku.rake
@@ -16,6 +16,7 @@ namespace :heroku do | @@ -16,6 +16,7 @@ namespace :heroku do | ||
16 | if ask_yn("Use Amazon S3 for Paperclip uploads?") | 16 | if ask_yn("Use Amazon S3 for Paperclip uploads?") |
17 | vars[:S3_KEY] = ask_value('S3 key') | 17 | vars[:S3_KEY] = ask_value('S3 key') |
18 | vars[:S3_SECRET] = ask_value('S3 secret key') | 18 | vars[:S3_SECRET] = ask_value('S3 secret key') |
19 | + vars[:S3_BUCKET] = ask_value('S3 bucket') | ||
19 | end | 20 | end |
20 | 21 | ||
21 | if ask_yn("Use Google Analytics to track web traffic?") | 22 | if ask_yn("Use Google Analytics to track web traffic?") |