diff --git a/release/build.xml b/release/build.xml
index 95dd482309..280dad8860 100755
--- a/release/build.xml
+++ b/release/build.xml
@@ -16,8 +16,8 @@
-
-
+
+
@@ -25,11 +25,13 @@
-
+
+
-
+
+
@@ -134,9 +136,9 @@
Downloading Restcomm Media version: ${restcomm-media.version}.${restcomm-media.build}
+
-
-
+
@@ -162,17 +164,18 @@
-
+
+
+
+
-
+
-
-
diff --git a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh
index 6a1a099f62..aff3270af3 100755
--- a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-SecureSSL.sh
+++ b/restcomm/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\".*>/ /" $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/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-media-server.sh b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-media-server.sh
new file mode 100755
index 0000000000..a2dc24a3b8
--- /dev/null
+++ b/restcomm/configuration/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 (vladimir.morosev@telestax.com)
+##
+
+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/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh
index 05ada88547..350e3d2fc8 100755
--- a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh
+++ b/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh
@@ -780,17 +780,6 @@ confRcmlserver() {
echo "Configured . 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
new file mode 100644
index 0000000000..d31b704809
--- /dev/null
+++ 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
deleted file mode 100644
index 4dfa3d8fed..0000000000
--- a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/mediaserver.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/bash
-
-## Description: List of variables used to configure RestComm Media Server
-## Author : Henrique Rosa (henrique.rosa@telestax.com)
-
-# Network
-BIND_ADDRESS=127.0.0.1
-EXTERNAL_ADDRESS=
-NETWORK=127.0.0.1
-SUBNET=255.255.255.255
-USE_SBC=true
-
-# MGCP Controller
-MGCP_ADDRESS=127.0.0.1
-MGCP_PORT=2427
-
-# Media
-MEDIA_TIMEOUT=0
-MEDIA_MAX_DURATION=14440
-MEDIA_LOW_PORT=64534
-MEDIA_HIGH_PORT=65534
-MEDIA_JITTER_SIZE=50
-MEDIA_CODECS=pcmu,pcma,telephone-event
-
-# Resources
-EXPECTED_LOAD=50
-AUDIO_CACHE_SIZE=100
-AUDIO_CACHE_ENABLED=false
-DTMF_DETECTOR_DBI=-30
-DTMF_DETECTOR_TONE_DURATION=80
-DTMF_DETECTOR_TONE_INTERVAL=400
-
-# DTLS
-DTLS_MIN_VERSION=1.0
-DTLS_MAX_VERSION=1.2
-DTLS_CIPHER_SUITE=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
-DTLS_CERTIFICATE=conf/dtls/x509-server-ecdsa.pem
-DTLS_KEY=conf/dtls/x509-server-key-ecdsa.pem
-DTLS_ALGORITHM=ecdsa
-
-# Logger
-LOG_APPENDER_CONSOLE=INFO
-LOG_APPENDER_FILE=INFO
-
-LOG_FILE_URL=log/server.log
-
-LOG_CATEGORY_MEDIA_SERVER='org.mobicents.media.server:INFO'
-LOG_CATEGORY_MGCP='org.mobicents.media.control.mgcp:INFO'
-LOG_CATEGORY_RTP='org.mobicents.media.server.impl.rtp:INFO'
-LOG_CATEGORY_RTCP='org.mobicents.media.server.impl.rtcp:INFO'
-
-# SSL
-SSL_ENABLED=false
-SSL_KEYSTORE=restcomm.jks
-SSL_PASSWORD=changeme
-
-# Java
-MS_OPTS="-Xms2048m -Xmx2048m -XX:+UseG1GC -XX:ParallelGCThreads=8 -XX:ConcGCThreads=8 -XX:G1RSetUpdatingPauseTimePercent=10 -XX:+ParallelRefProcEnabled -XX:G1HeapRegionSize=4m -XX:G1HeapWastePercent=5 -XX:InitiatingHeapOccupancyPercent=85 -XX:+UnlockExperimentalVMOptions -XX:G1MixedGCLiveThresholdPercent=85 -XX:+AlwaysPreTouch -XX:+UseCompressedOops -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dhttp.keepAlive=false -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=../../mediaserver_dumpfile-$(date +%b_%d_%Y_%H_%M_%S).bin"
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
deleted file mode 100755
index cadee45e16..0000000000
--- a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/start-mediaserver.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/bash
-
-## Description: Starts Media Server with auto-configuration.
-## Author : Henrique Rosa (henrique.rosa@telestax.com)
-
-startMediaServer() {
- local basedir=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
- local ms_conf=$basedir/mediaserver.conf
- local ms_home=$RESTCOMM_HOME/mediaserver
-
- chmod +x $ms_home/*.sh
- chmod +x $ms_home/.autoconfig/*.sh
- chmod +x $ms_home/.autoconfig/autoconfig.d/*.sh
- chmod +x $ms_home/bin/*.sh
-
- $ms_home/start-mediaserver.sh $ms_conf
-}
-
-startMediaServer
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
index ae6ba7538e..c690e317c0 100755
--- 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
deleted file mode 100755
index a8f2904939..0000000000
--- a/restcomm/configuration/config-scripts/as7-config-scripts/restcomm/stop-mediaserver.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash
-
-## Description: Stops Media Server running in a terminal session.
-## Author : Henrique Rosa (henrique.rosa@telestax.com)
-
-stopMediaServer() {
- local ms_home=$RESTCOMM_HOME/mediaserver
- $ms_home/stop-mediaserver.sh
-}
-
-stopMediaServer
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
index 6c91d6232d..9c67e07472 100755
--- 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() {