Issue marklogic-community#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
jmeekhof · Nov 3, 2016 · 6745110 · 6745110
1 parent 80c3392
commit 6745110
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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