Fixed marklogic-community#414: ENV vars override loaded prop values

grtjn · Jul 1, 2015 · 09c17da · 09c17da
1 parent 764c600
commit 09c17da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb
@@ -1911,7 +1911,7 @@ def ServerConfig.load_properties(properties_filename, prefix = "")
           if i
             key = prefix + line[0..i - 1].strip
             value = line[i + 1..-1].strip
-            properties[key] = value
+            properties[key] = ENV[key.sub("ml.", "ml_")] || value
           end
         end
       end