diff --git a/Gemfile b/Gemfile index e38df340..c4874273 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source :rubygems +ruby '1.9.3' # FRAMEWORK gem 'rails', git: 'git://github.com/rails/rails.git', branch: '3-2-stable' diff --git a/config/initializers/dogfood.rb b/config/initializers/dogfood.rb index 80ef89cf..b8adbaad 100644 --- a/config/initializers/dogfood.rb +++ b/config/initializers/dogfood.rb @@ -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) diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 10a4401e..10a7e703 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -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']