From b1863e649da0d0f576cfa98fa03fcea72d9cd9a2 Mon Sep 17 00:00:00 2001 From: Nico Date: Wed, 13 Feb 2013 00:03:03 +0100 Subject: [PATCH] essai --- Gemfile | 4 ++-- config/database.yml | 1 - config/environments/production.rb | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 0301495..f981a03 100644 --- a/Gemfile +++ b/Gemfile @@ -20,10 +20,10 @@ gem 'mysql2' gem 'jquery-rails' # To use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' +gem 'bcrypt-ruby', '~> 3.0.0' # Use unicorn as the web server -# gem 'unicorn' +gem 'unicorn' # Deploy with Capistrano gem 'capistrano' diff --git a/config/database.yml b/config/database.yml index 0f819df..c61aa76 100644 --- a/config/database.yml +++ b/config/database.yml @@ -9,7 +9,6 @@ development: database: blog_app pool: 5 username: root -# password: dev socket: /tmp/mysql.sock # Warning: The database defined as "test" will be erased and diff --git a/config/environments/production.rb b/config/environments/production.rb index 97e1f0f..a66d1f0 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -25,7 +25,8 @@ Crossey2::Application.configure do # Specifies the header that your server uses for sending files # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx + + config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true