From a51de416cbb08027aabbcb2f12389863f6e82a58 Mon Sep 17 00:00:00 2001
From: Bruno Nocera Zanette <bnzanette@inf.ufpr.br>
Date: Wed, 9 Sep 2015 16:56:27 -0300
Subject: [PATCH] Refactor code: Use correct code pattern
---
config/initializers/dspace.rb | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/config/initializers/dspace.rb b/config/initializers/dspace.rb
index f4b6351b..cf63e0c4 100644
--- a/config/initializers/dspace.rb
+++ b/config/initializers/dspace.rb
@@ -3,7 +3,14 @@ require 'yaml'
dspace_configs = YAML.load_file(Rails.root.join('config').to_s.concat('/dspace.yml'))
env_config = dspace_configs.fetch(Rails.env)
-Dspace::Config.host = env_config['host']
-Dspace::Config.port = env_config['port']
-Dspace::Config.rest_webapp_name = env_config['rest_webapp_name']
-Dspace::Config.solr_webapp_name = env_config['solr_webapp_name']
+if Rails.env.production?
+ Dspace::Config.host = ENV['PORTALMEC_DSPACE_HOST']
+ Dspace::Config.port = ENV['PORTALMEC_DSPACE_PORT']
+ Dspace::Config.rest_webapp_name = ENV['PORTALMEC_DSPACE_REST_NAME']
+ Dspace::Config.solr_webapp_name = ENV['PORTALMEC_DSPACE_SOLR_NAME']
+else
+ Dspace::Config.host = env_config['host']
+ Dspace::Config.port = env_config['port']
+ Dspace::Config.rest_webapp_name = env_config['rest_webapp_name']
+ Dspace::Config.solr_webapp_name = env_config['solr_webapp_name']
+end
--
GitLab