Merge pull request #767 from grtjn/753-use-https-for-rest

Fixed #753: added new use-https-for-rest property

Author: RobertSzkutak

deploy/default.properties

@@ -193,6 +193,12 @@ install-xcc=true
 #
 use-https=false
 
+#
+# set this to true if you are accessing your rest server through
+# a proxy that uses https (but your rest server does not)
+#
+use-https-for-rest=false
+
 ## Security
 #
 # The authentication used for your appserver

deploy/lib/server_config.rb

@@ -2238,7 +2238,7 @@ def mlRest
         :http_connection_open_timeout => @properties["ml.http.open-timeout"].to_i,
         :http_connection_read_timeout => @properties["ml.http.read-timeout"].to_i,
         :http_connection_retry_delay => @properties["ml.http.retry-delay"].to_i,
-        :use_https_for_rest => @properties["ml.ssl-certificate-template"].present?
+        :use_https_for_rest => @properties["ml.ssl-certificate-template"].present? || @properties["ml.use-https-for-rest"] == "true"
       })
     else
       @mlRest