Merge branch 'master' into issue_2741

Author: jaimecasero

LICENSE

@@ -56,7 +56,10 @@ Continuous Integration and Delivery
 
 Acknowledgements
 ========
-Java Profiler sponsored by YourKit 
-[![YourKit The Industry Leader in .NET & Java Profiling](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/)
 
-[See who has been contributing to RestComm](http://www.telestax.com/opensource/acknowledgments/)
+* [![YourKit The Industry Leader in .NET & Java Profiling](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/) Java Profiler sponsored by YourKit
+
+* [![JProfiler](https://www.ej-technologies.com/images/product_banners/jprofiler_large.png)](https://www.ej-technologies.com/products/jprofiler/overview.html) JProfiler Open Source License
+
+---
+We also maintain a list of [all Restcomm contributors](http://www.telestax.com/opensource/acknowledgments/) on the Restcomm website, to acknowledge contributions by the broad open source community.

README.md

@@ -18,6 +18,10 @@ SECURESSL=FALSE
 TRUSTSTORE_FILE='restcomm-crt.jks' #File should be located at $RESTCOMM_HOME/standalone/configuration folder. Provide just the name of the trustore file.
 TRUSTSTORE_PASSWORD='changeme' #Password for the trustore file
 TRUSTSTORE_ALIAS='restcomm' #The certificate alias
+#comma separated protocols to set on SSLEngine, if empty use stack defaults
+SSL_PROTOCOLS=''
+#comma separated cipher suites to set on SSLEngine, if empty use stack defaults
+SSL_CIPHER_SUITES=''
 
 #HTTPS Settings
 DISABLE_HTTP='false' #Control HTTP connector behavior. Values, TRUE=HTTP connector will be disable, FALSE=HTTP Connector will be active, REDIRECT= http -> https redirection will be enabled (For CLI RestAPI requests when redirect is active https needs to be used).

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf

@@ -147,6 +147,25 @@ MssStackConf(){
    		sed -i '/gov.nist.javax.sip.TLS_CLIENT_AUTH_TYPE='"$TLS_CLIENT_AUTH_TYPE"'/,+5d' $FILE
  	fi
 
+        if [ -n "$SSL_PROTOCOLS" ]; then
+            if  grep -q "gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS" "$FILE"; then
+                 sed -i "s|gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=.*|gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=$SSL_PROTOCOLS|" $FILE
+            else
+                echo "gov.nist.javax.sip.TLS_CLIENT_PROTOCOLS=$SSL_PROTOCOLS"'' >> $FILE
+            fi
+
+        fi
+
+        if [ -n "$SSL_CIPHER_SUITES" ]; then
+            if  grep -q "gov.nist.javax.sip.ENABLED_CIPHER_SUITES" "$FILE"; then
+                sed -i "s|gov.nist.javax.sip.ENABLED_CIPHER_SUITES=.*|gov.nist.javax.sip.ENABLED_CIPHER_SUITES=$SSL_CIPHER_SUITES|" $FILE
+            else
+                echo 'gov.nist.javax.sip.ENABLED_CIPHER_SUITES='"$SSL_CIPHER_SUITES"'' >> $FILE
+            fi
+
+        fi
+
+
 	if [[ "$TRUSTSTORE_FILE" = /* ]]; then
 		TRUSTSTORE_LOCATION=$TRUSTSTORE_FILE
 	else

restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh

@@ -181,7 +181,7 @@
         <module>restcomm.monitoring.service</module>
         <module>restcomm.tts.awspolly</module>
         <module>restcomm.sdr.api</module>
-        <module>restcomm-connect.core</module>
+        <module>restcomm.core</module>
     </modules>
 
     <dependencyManagement>