From eb50ef081a56187d5ab57a8b096d46935e90a39c Mon Sep 17 00:00:00 2001 From: David Rice Date: Sat, 2 Feb 2013 15:33:06 +0000 Subject: [PATCH 1/3] Squash requires Ruby 1.9.3 so let's tell bundler about that --- Gemfile | 1 + 1 file changed, 1 insertion(+) 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' From 774d4d1644b5d8adf6c7575843ec9bc792ac5fe7 Mon Sep 17 00:00:00 2001 From: David Rice Date: Sat, 2 Feb 2013 15:50:42 +0000 Subject: [PATCH 2/3] Use ENV variable SQUASH_SECRET_TOKEN --- config/initializers/secret_token.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'] From 5c9d19e1a01773e99d19a9187d98aafdafb59066 Mon Sep 17 00:00:00 2001 From: David Rice Date: Sat, 2 Feb 2013 16:17:15 +0000 Subject: [PATCH 3/3] Configure password salt using ENV variable SQUASH_AUTHENTICATION_PASSWORD_SALT --- config/initializers/dogfood.rb | 5 +++++ 1 file changed, 5 insertions(+) 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)