diff --git a/Gemfile b/Gemfile index 02acc12..277ca8d 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ gem "oauth-plugin", "~> 0.4.0" gem 'twitter-bootstrap-rails' gem 'less-rails' +gem 'newrelic_rpm' # use Devise for login gem 'devise' @@ -55,4 +56,4 @@ gem 'merit' gem 'ambry' # Use gravatar's on profile pages -gem 'gravatar_image_tag' \ No newline at end of file +gem 'gravatar_image_tag' diff --git a/Gemfile.lock b/Gemfile.lock index dd2008e..a485b05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,6 +99,7 @@ GEM net-ssh (2.6.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) + newrelic_rpm (3.5.4.34) nokogiri (1.5.6) oauth (0.4.7) oauth-plugin (0.4.1) @@ -204,6 +205,7 @@ DEPENDENCIES libv8 merit mysql2 + newrelic_rpm nokogiri oauth-plugin (~> 0.4.0) omniauth diff --git a/config/deploy.rb b/config/deploy.rb index 0a4e589..f12e716 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -31,6 +31,7 @@ set :branch, 'master' role :app, "mooculus-1.asc.ohio-state.edu" role :web, "mooculus-1.asc.ohio-state.edu" + role :web, "mooculus-2.asc.ohio-state.edu" role :db, "mooculus-1.asc.ohio-state.edu", :primary => true end @@ -53,6 +54,7 @@ "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml", "ln -nfs #{shared_path}/config/piwik.yml #{release_path}/config/piwik.yml", "ln -nfs #{shared_path}/config/secret_token.rb #{release_path}/config/initializers/secret_token.rb", + "ln -nfs #{shared_path}/config/newrelic.yml #{release_path}/config/newrelic.yml", "ln -fs #{shared_path}/uploads #{release_path}/uploads", "ln -fs #{shared_path}/tmp/pids #{release_path}/tmp/pids", "rm #{release_path}/public/system"