From c516b6f8887c1c17b8fb38e079d4e8b4e4938f64 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 7 Apr 2016 01:04:00 -0500 Subject: [PATCH] add devise secret --- Rakefile | 9 --------- app/views/layouts/application.html.erb | 2 +- config/database.yml | 3 +-- config/environments/production.rb | 2 +- config/environments/test.rb | 2 +- config/initializers/devise.rb | 4 ++-- config/secrets.yml | 1 + 7 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Rakefile b/Rakefile index 93034a96..ff6f1149 100644 --- a/Rakefile +++ b/Rakefile @@ -1,11 +1,2 @@ -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically -# be available to Rake. - require File.expand_path('../config/application', __FILE__) -#require 'rubocop/rake_task' - -#RuboCop::RakeTask.new -#task default: 'rubocop' - Rails.application.load_tasks diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 45ff607e..64116a2c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - Indent + Notebook <%= stylesheet_link_tag 'application' %> <%= javascript_include_tag 'application' %> <%= csrf_meta_tags %> diff --git a/config/database.yml b/config/database.yml index 1c1a37ca..34cd6a6c 100644 --- a/config/database.yml +++ b/config/database.yml @@ -21,5 +21,4 @@ test: database: db/test.sqlite3 production: - <<: *default - database: db/production.sqlite3 + url: <%= ENV['DATABASE_URL'] %> diff --git a/config/environments/production.rb b/config/environments/production.rb index 1f990458..67f55c6f 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -10,7 +10,7 @@ Rails.application.configure do config.eager_load = true # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false + config.serve_static_files = false # Compress JavaScripts and CSS. config.assets.js_compressor = :uglifier diff --git a/config/environments/test.rb b/config/environments/test.rb index aa5e9f37..f14c6e11 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -8,7 +8,7 @@ Rails.application.configure do config.cache_classes = true # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true + config.serve_static_files = true config.static_cache_control = 'public, max-age=3600' config.eager_load = false diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index ad72210a..19252e65 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -6,13 +6,13 @@ Devise.setup do |config| # confirmation, reset password and unlock tokens in the database. # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key` # by default. You can change it below and use your own secret key. - # config.secret_key = '997e765e0d71e4f2400867bc60f5710459e40f101837a8b3b6d6b98cded073b9dcb5831bd0171355db85fad1e34f90d2e3bd3e8259bc4e7d7e0dde6a711ac6b5' + config.secret_key = '81af3b7e066c6e98abdc277d2f97b72c179d4b4332c4cf0434f99681d1f81693713e41b58d076e0493c003d12451b2c5953d42ab3f66e9c31d6fa760db0aad0c' # ==> Mailer Configuration # Configure the e-mail address which will be shown in Devise::Mailer, # note that it will be overwritten if you use your own mailer class # with default "from" parameter. - config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + config.mailer_sender = 'notebook@indentlabs.com' # Configure the class responsible to send e-mails. # config.mailer = 'Devise::Mailer' diff --git a/config/secrets.yml b/config/secrets.yml index c2f2dfba..e07acc87 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -19,4 +19,5 @@ test: # Do not keep production secrets in the repository, # instead read values from the environment. production: + secret_token: <%= ENV['SECRET_TOKEN'] %> secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>