RestComm · morosev · May 2, 2018 · May 2, 2018 · May 4, 2018 · May 6, 2018
diff --git a/release/build.xml b/release/build.xml
@@ -16,20 +16,22 @@
   <property name="sipservlets-build" value="89"/>
   <property name="restcomm-sipservlets-as7.version" value="3.2.0-${sipservlets-build}"/>
   <!--<property name="jain-sip-ri.version" value="7.0.3.190" />-->
-  <property name="restcomm-media.version" value="6.0"/>
-  <property name="restcomm-media.build" value="23"/>
+  <property name="restcomm-media.version" value="8.2.0"/>
+  <property name="restcomm-media.build" value="SNAPSHOT"/>
   <!--property name="mobicents-diameter.version" value="6.1.2.GA" /-->
 
   <!-- mobicents SIP Servlets 7.x on JBoss AS7-->
   <property name="restcomm-sipservlets.as7.download.distro.file" value="restcomm-sip-servlets-3.2.0-89-jboss-as-7.2.0.Final.zip"/>
   <property name="restcomm-sipservlets.as7.download.url" value="https://app.box.com/shared/static/bz0fnva3yiv5m93qnzn0xnn5j2zme8og.zip"/>
   <property name="restcomm-sipservlets.as7.distro.zip.path" value="${checkout.dir}/${restcomm-sipservlets.as7.download.distro.file}"/>
 
-  <property name="restcomm-media.download.distro.file" value="restcomm-media-server.zip"/>
+  <property name="restcomm-media.download.distro.name" value="media-server-standalone-${restcomm-media.version}-${restcomm-media.build}"/>
+  <property name="restcomm-media.download.distro.file" value="${restcomm-media.download.distro.name}.zip"/>
   <!--<property name="mobicents-media.download.url" value="https://github.com/Mobicents/mediaserver/releases/download/3.0.2.FINAL/mms-server-3.0.2.Final.zip" />-->
   <!--property name="mobicents-media.download.url" value="https://mobicents.ci.cloudbees.com/view/MediaServer/job/Mobicents-MediaServer-2.x/lastSuccessfulBuild/artifact/bootstrap/target/mms-server.zip" /-->
   <!--property name="mobicents-media.download.url" value="https://mobicents.ci.cloudbees.com/view/MediaServer/job/Mobicents-MediaServer-4.x/lastSuccessfulBuild/artifact/bootstrap/target/mms-server.zip"/-->
-  <property name="restcomm-media.download.url" value="https://mobicents.ci.cloudbees.com/view/MediaServer/job/Restcomm-MediaServer-6.x/${restcomm-media.build}/artifact/bootstrap/target/restcomm-media-server.zip"/>
+  <!--property name="restcomm-media.download.url" value="https://mobicents.ci.cloudbees.com/view/MediaServer/job/Restcomm-MediaServer-6.x/${restcomm-media.build}/artifact/bootstrap/target/restcomm-media-server.zip"/-->
+  <property name="restcomm-media.download.url" value="https://app.box.com/shared/static/hinshsd0zp8dk7my0d5t65n58dnwvwnu.zip"/>
   <property name="restcomm-media.distro.zip.path" value="${checkout.dir}/${restcomm-media.download.distro.file}"/>
 
   <!-- <property name="restcomm-olympus.download.url" value="https://mobicents.ci.cloudbees.com/job/Olympus/${olympus.build}/artifact/target/olympus.war"/> -->
@@ -134,9 +136,9 @@
     <echo>Downloading Restcomm Media version: ${restcomm-media.version}.${restcomm-media.build}</echo>
     <exec executable="wget" failonerror="true">
       <arg value="${restcomm-media.download.url}"/>
+      <arg value="--output-document=${restcomm-media.download.distro.file}"/>
     </exec>
-    <move file="${base.dir}/restcomm-media-server.zip" todir="${checkout.dir}"/>
-    <move file="${checkout.dir}/restcomm-media-server.zip" tofile="${checkout.dir}/${restcomm-media.download.distro.file}"/>
+    <move file="${base.dir}/${restcomm-media.download.distro.file}" todir="${checkout.dir}"/>
   </target>
 
   <!--Olympus-->
@@ -162,17 +164,18 @@
 
   <target depends="get-restcomm-media" name="extract-restcomm-media">
     <delete dir="${checkout.restcomm-media.dir}" failonerror="false"/>
-    <delete dir="${release.as7.dir}/mobicents-media-server" failonerror="false"/>
+    <delete dir="${release.as7.dir}/restcomm-media-server" failonerror="false"/>
     <!--unzip src="${mobicents-media.distro.zip.path}" dest="${release.dir}/mobicents-media"/-->
     <unzip dest="${release.as7.dir}/mediaserver" src="${restcomm-media.distro.zip.path}"/>
+    <exec executable="ls" failonerror="false">
+      <arg value="-l ${release.as7.dir}/mediaserver"/>
+    </exec>
     <move todir="${release.as7.dir}/mediaserver">
-      <fileset dir="${release.as7.dir}/mediaserver/restcomm-media-server"/>
+      <fileset dir="${release.as7.dir}/mediaserver/${restcomm-media.download.distro.name}"/>
     </move>
     <!-- copy failonerror="true" file="${configuration.directory}/mms-server-beans.xml" tofile="${release.as7.dir}/mediaserver/deploy/server-beans.xml"/ -->
     <chmod dir="${release.as7.dir}/mediaserver" includes="**/*.sh" perm="ugo+rx"/>
     <chmod dir="${release.as7.dir}/mediaserver/bin" includes="**/*.sh" perm="ugo+rx"/>
-    <chmod dir="${release.as7.dir}/mediaserver/.autoconfig" includes="**/*.sh" perm="ugo+rx"/>
-    <chmod dir="${release.as7.dir}/mediaserver/.autoconfig/autoconfig.d" includes="**/*.sh" perm="ugo+rx"/>
   </target>
 
   <target name="build-restcomm">

diff --git a/...configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh b/...configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh
@@ -20,10 +20,6 @@ NoSslRestConf(){
 	mv $FILE.bak $FILE
 	sed -e "s/<.*connector name=\"http\".*>/<connector name=\"http\" protocol=\"HTTP\/1.1\" scheme=\"http\" socket-binding=\"http\"\/> /" $FILE > $FILE.bak
 	mv $FILE.bak $FILE
-
-    sed -i "s|SSL_ENABLED=.*|SSL_ENABLED=false|" $RESTCOMM_BIN/restcomm/mediaserver.conf
-    sed -i "s|SSL_KEYSTORE=.*|SSL_KEYSTORE=restcomm.jks|" $RESTCOMM_BIN/restcomm/mediaserver.conf
-    sed -i "s|SSL_PASSWORD=.*|SSL_PASSWORD=changeme|" $RESTCOMM_BIN/restcomm/mediaserver.conf
 }
 
 ####funcitions for SECURESSL="SELF" || SECURESSL="AUTH" ####
@@ -197,10 +193,6 @@ SslRMSConf(){
 	    else
 		    CERTIFICATION_FILE="$RESTCOMM_CONF/$TRUSTSTORE_FILE"
 	    fi
-
-        sed -i "s|SSL_ENABLED=.*|SSL_ENABLED=true|" $RESTCOMM_BIN/restcomm/mediaserver.conf
-        sed -i "s|SSL_KEYSTORE=.*|SSL_KEYSTORE=${CERTIFICATION_FILE}|" $RESTCOMM_BIN/restcomm/mediaserver.conf
-        sed -i "s|SSL_PASSWORD=.*|SSL_PASSWORD=${TRUSTSTORE_PASSWORD}|" $RESTCOMM_BIN/restcomm/mediaserver.conf
     fi
 }
 

diff --git a/...figuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-media-server.sh b/...figuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-media-server.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+##
+## Description: Configures RestComm Nedia Server
+## Author: Vladimir Morosev ([email protected])
+##
+
+BASEDIR=$RESTCOMM_HOME
+
+# Copy Media Server configuration overrides to configuration folder
+copyConfiguration(){
+    cp -f $BASEDIR/bin/restcomm/media-extra.yml $BASEDIR/mediaserver/conf
+}
+
+# MAIN
+echo 'Configuring Media Server...'
+copyConfiguration
diff --git a/.../configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh b/.../configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh
@@ -780,17 +780,6 @@ confRcmlserver() {
     echo "Configured <rcmlserver/>. base-url set to '$RVD_URL'"
 }
 
-
-#Auto Configure RMS Networking, if  MANUAL_SETUP=false.
-configRMSNetworking() {
-    if [[ "$MANUAL_SETUP" == "false" || "$MANUAL_SETUP" == "FALSE" ]]; then
-        sed -i "s|BIND_ADDRESS=.*|BIND_ADDRESS=${BIND_ADDRESS}|" $RESTCOMM_BIN/restcomm/mediaserver.conf
-        sed -i "s|MGCP_ADDRESS=.*|MGCP_ADDRESS=${BIND_ADDRESS}|" $RESTCOMM_BIN/restcomm/mediaserver.conf
-        sed -i "s|NETWORK=.*|NETWORK=${BIND_NETWORK}|" $RESTCOMM_BIN/restcomm/mediaserver.conf
-        sed -i "s|SUBNET=.*|SUBNET=${BIND_SUBNET_MASK}|" $RESTCOMM_BIN/restcomm/mediaserver.conf
-    fi
-}
-
 configAsrDriver() {
     if [ ! -z "$MG_ASR_DRIVERS" ] && [ ! -z "$MG_ASR_DRIVER_DEFAULT" ]; then
         FILE=$RESTCOMM_DEPLOY/WEB-INF/conf/restcomm.xml
@@ -909,7 +898,6 @@ configPushNotificationServer
 otherRestCommConf
 confRcmlserver
 confRVD
-configRMSNetworking
 configAsrDriver
 configDnsProvisioningManager
 configConferenceTimeout

diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/media-extra.yml b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/media-extra.yml
@@ -0,0 +1,66 @@
+mediaserver:
+
+  network:
+    address: 127.0.0.1
+    externalAddress: null
+    network: 127.0.0.1
+    subnet: 255.255.255.255
+    sbc: false
+
+  controller:
+    mgcp:
+      address: 127.0.0.1
+      port: 2427
+    endpoints:
+        - name: "mobicents/bridge/"
+          relay: splitter
+        - name: "mobicents/ivr/"
+          relay: mixer
+        - name: "mobicents/cnf/"
+          relay: mixer
+
+  media:
+    timeout: 0
+    halfOpenDuration: 300
+    maxDuration: 14400
+    lowPort: 34534
+    highPort: 65534
+    codecs:
+      - pcmu
+      - pcma
+      - opus
+      - l16
+      - gsm
+      - g729
+      - telephone-event
+
+  resources:
+    player:
+      connectionTimeout: 2000
+      cache:
+        enabled: false
+        size: 100
+    dtmfDetector:
+      dbi: -35
+      toneDuration: 100
+      toneInterval: 20
+
+  dtls:
+    minVersion: 1.0
+    maxVersion: 1.2
+    cipherSuites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
+    certificate:
+      path: "../conf/dtls/x509-server-ecdsa.pem"
+      key: "../conf/dtls/x509-server-key-ecdsa.pem"
+      algorithm: ecdsa
+
+  ssl:
+    keyStore: null
+    keyStorePassword: null
+    trustStore: null
+    trustStorePassword: null
+    trustStoreType: null
+
+media-plugin-vad-noise-threshold:
+  silenceLevel: 10
+
diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/mediaserver.conf b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/mediaserver.conf
diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/start-mediaserver.sh b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/start-mediaserver.sh
diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/start-restcomm.sh b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/start-restcomm.sh
@@ -132,8 +132,6 @@ echo "Looking for the IP Address, subnet, network and broadcast_address"
 fi
 
 BIND_ADDRESS="$PRIVATE_IP"
-BIND_NETWORK="$NETWORK"
-BIND_SUBNET_MASK="$SUBNET_MASK"
 
 if [[ -z "$STATIC_ADDRESS" ]]; then
 	STATIC_ADDRESS=$BIND_ADDRESS
@@ -158,7 +156,7 @@ if [[ "$MANUAL_SETUP" == "false" || "$MANUAL_SETUP" == "FALSE" ]]; then
 fi
 
 if [[ "$MS_EXTERNAL" == "false" || "$MS_EXTERNAL" == "FALSE" ]]; then
-    source $BASEDIR/start-mediaserver.sh
+    source $MMS_HOME/bin/start-mediaserver.sh
 fi
 # start restcomm in selected run mode
 startRestcomm "$RUN_MODE" "$BIND_ADDRESS"

diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/stop-mediaserver.sh b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/stop-mediaserver.sh
diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/stop-restcomm.sh b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/stop-restcomm.sh
@@ -9,7 +9,7 @@ RESTCOMM_HOME=$(cd $BASEDIR/../../ && pwd)
 MS_HOME=$RESTCOMM_HOME/mediaserver
 
 stopMediaServer() {
-    source $BASEDIR/stop-mediaserver.sh
+    source $MS_HOME/bin/stop-mediaserver.sh
 }
 
 stopRestComm() {