Skip to content

Use ENV variables for configuration, more upgradable (and Heroku support) #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidjrice wants to merge 3 commits into
base: master
Choose a base branch
from
+7 −1
Open

Use ENV variables for configuration, more upgradable (and Heroku support) #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb50ef0
Squash requires Ruby 1.9.3 so let's tell bundler about that
davidjrice Feb 2, 2013
774d4d1
Use ENV variable SQUASH_SECRET_TOKEN
davidjrice Feb 2, 2013
5c9d19e
Configure password salt using ENV variable SQUASH_AUTHENTICATION_PASS…
davidjrice Feb 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
source :rubygems
ruby '1.9.3'
Copy link

@pda pda Mar 15, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest dropping your eb50ef0 commit, because:

  • Ruby 1.9.3 is specified in Gemfile as of ab1b97d.
  • This isn't relevant to using ENV variables for configuration.
  • Merging your branch will conflict because the Gemfile source has also been changed.


# FRAMEWORK
gem 'rails', git: 'git://github.com/rails/rails.git', branch: '3-2-stable'
Expand Down
5 changes: 5 additions & 0 deletions config/initializers/dogfood.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@

Squash::Ruby.configure Squash::Configuration.dogfood

Squash::Configuration.authentication.strategy == 'password'
Squash::Configuration.authentication['password'] = {
salt: ENV['SQUASH_AUTHENTICATION_PASSWORD_SALT']
}

# Auto-configure development dogfood

unless defined?(IRB)
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/secret_token.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
Squash::Application.config.secret_token = '_SECRET_'
Squash::Application.config.secret_token = ENV['SQUASH_SECRET_TOKEN']