Merge pull request #781 from grtjn/749-app-modules-db-legacy

Fixed #749: added app-modules-db prop for legacy with dep warning

deploy/default.properties

@@ -108,6 +108,9 @@ app-role=${app-name}-role
 content-db=${app-name}-content
 modules-db=${app-name}-modules
 
+# Note: purely for legacy support!
+app-modules-db=${modules-db}
+
 #
 # Number of forests to create per host in the group for the content-db
 #

deploy/lib/server_config.rb

@@ -2870,6 +2870,15 @@ def build_config(config_files)
   end
 
   def replace_properties(contents, name)
+    # warn for deprecated properties
+    deprecated={
+      "app-modules-db" => "modules-db"
+    }
+    contents.scan(/(@ml.|[@$]\{)(app-modules-db)(\}?)/).each do |match|
+      key=match[1]
+      logger.warn("Deprecated property #{match.join} used in #{name}, please use ${#{deprecated[key]}} instead!")
+    end
+
     # make sure to apply descending order to replace @ml.foo-bar before @ml.foo
     @properties.sort {|x,y| y <=> x}.each do |k, v|
       # new property syntax: @{app-name} or ${app-name}