Merge pull request #425 from grtjn/361-schemas-in-modules

Fixed #364: suppress triggers/schemas in ml-config if eq modules
marklogic-community · Apr 30, 2015 · 1034d0b · 1034d0b
2 parents a63db66 + 9028100
commit 1034d0b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb
@@ -1806,7 +1806,8 @@ def build_config(config_file)
     config = File.read(config_file)
 
     # Build the triggers db if it is provided
-    if @properties['ml.triggers-db'].present?
+    if @properties['ml.triggers-db'].present? &&
+       @properties['ml.triggers-db'] != @properties['ml.app-modules-db']
       config.gsub!("@ml.triggers-db-xml",
       %Q{
       <database>
@@ -1858,7 +1859,8 @@ def build_config(config_file)
       }) if @properties['ml.odbc-port'].present?
 
     # Build the schemas db if it is provided
-    if @properties['ml.schemas-db'].present?
+    if @properties['ml.schemas-db'].present? &&
+       @properties['ml.schemas-db'] != @properties['ml.app-modules-db']
       config.gsub!("@ml.schemas-db-xml",
       %Q{
       <database>