From 6745110bee50338f932ded427a97367417253616 Mon Sep 17 00:00:00 2001 From: Josh Meekhof Date: Thu, 3 Nov 2016 08:50:19 -0400 Subject: [PATCH] Issue #685: Grab path relative to project root The path indicated by shared_config looks for the file relative to the root of the roxy project --- deploy/lib/server_config.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 4a61ec7a..efebae60 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -2685,8 +2685,9 @@ def ServerConfig.properties(prop_file_location = @@path) properties = ServerConfig.load_properties(default_properties_file, "ml.") properties.merge!(ServerConfig.load_properties(properties_file, "ml.")) + #Look for optional shared_config, if it is set grab the properties from path relative to the root of the roxy project if properties['ml.shared_config'] then - shared_properties_file = ServerConfig.expand_path(properties['ml.shared_config']) + shared_properties_file = ServerConfig.expand_path("#{@@path}/../#{properties['ml.shared_config']}") properties.merge!(ServerConfig.load_properties(shared_properties_file)) end