From bf63ecc8967fa700145b81db1d0dedcbef868d1d Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Tue, 19 Jul 2016 10:03:51 -0600
Subject: [PATCH] Replace $${hold_music} with local_stream://default. Remove
 the $${domain}, and outbound caller id name and number value as they wouldn't
 have a global value.

---
 .../conf/autoload_configs/conference.conf     | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/resources/templates/conf/autoload_configs/conference.conf b/resources/templates/conf/autoload_configs/conference.conf
index c6ece9de22..76637c0919 100644
--- a/resources/templates/conf/autoload_configs/conference.conf
+++ b/resources/templates/conf/autoload_configs/conference.conf
@@ -67,7 +67,7 @@
 			<param name="cdr-log-dir" value="auto"/>
 			<!--<param name="conference-flags" value="wait-mod" />-->
 			<!-- Domain (for presence) -->
-			<param name="domain" value="$${domain}"/>
+			<param name="domain" value=""/>
 			<!-- Sample Rate-->
 			<param name="rate" value="8000"/>
 			<!-- Number of milliseconds per frame -->
@@ -108,7 +108,7 @@
 			<!-- File to play endlessly (nobody will ever be able to talk) -->
 			<!--<param name="perpetual-sound" value="perpetual.wav"/>-->
 			<!-- File to play when you're alone (music on hold)-->
-			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="moh-sound" value="local_stream://default"/>
 			<!-- File to play when you join the conference -->
 			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
 			<!-- File to play when you leave the conference -->
@@ -131,9 +131,9 @@
 			<!-- Max number of times the user can be prompted for PIN -->
 			<!--<param name="pin-retries" value="3"/>-->
 			<!-- Default Caller ID Name for outbound calls -->
-			<param name="caller-id-name" value="$${outbound_caller_name}"/>
+			<param name="caller-id-name" value=""/>
 			<!-- Default Caller ID Number for outbound calls -->
-			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="caller-id-number" value=""/>
 			<!-- Suppress start and stop talking events -->
 			<!-- <param name="suppress-events" value="start-talking,stop-talking"/> -->
 			<!-- enable comfort noise generation -->
@@ -156,7 +156,7 @@
 		<profile name="wait-mod">
 			<param name="cdr-log-dir" value="auto"/>
 			<param name="conference-flags" value="wait-mod" />
-			<param name="domain" value="$${domain}"/>
+			<param name="domain" value=""/>
 			<param name="rate" value="8000"/>
 			<param name="interval" value="20"/>
 			<param name="energy-level" value="15"/>
@@ -166,7 +166,7 @@
 			<param name="muted-sound" value="conference/conf-muted.wav"/>
 			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
 			<param name="alone-sound" value="conference/conf-alone.wav"/>
-			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="moh-sound" value="local_stream://default"/>
 			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
 			<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
 			<param name="kicked-sound" value="conference/conf-kicked.wav"/>
@@ -175,13 +175,13 @@
 			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
 			<param name="pin-sound" value="conference/conf-pin.wav"/>
 			<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-			<param name="caller-id-name" value="$${outbound_caller_name}"/>
-			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="caller-id-name" value=""/>
+			<param name="caller-id-number" value=""/>
 			<param name="comfort-noise" value="true"/>
 		</profile>
 
 		<profile name="wideband">
-			<param name="domain" value="$${domain}"/>
+			<param name="domain" value=""/>
 			<param name="rate" value="16000"/>
 			<param name="interval" value="20"/>
 			<param name="energy-level" value="15"/>
@@ -192,7 +192,7 @@
 			<param name="muted-sound" value="conference/conf-muted.wav"/>
 			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
 			<param name="alone-sound" value="conference/conf-alone.wav"/>
-			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="moh-sound" value="local_stream://default"/>
 			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
 			<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
 			<param name="kicked-sound" value="conference/conf-kicked.wav"/>
@@ -201,15 +201,15 @@
 			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
 			<param name="pin-sound" value="conference/conf-pin.wav"/>
 			<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-			<param name="caller-id-name" value="$${outbound_caller_name}"/>
-			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="caller-id-name" value=""/>
+			<param name="caller-id-number" value=""/>
 			<param name="comfort-noise" value="true"/>
 			<!--<param name="tts-engine" value="flite"/>-->
 			<!--<param name="tts-voice" value="kal16"/>-->
 		</profile>
 
 		<profile name="ultrawideband">
-			<param name="domain" value="$${domain}"/>
+			<param name="domain" value=""/>
 			<param name="rate" value="32000"/>
 			<param name="interval" value="20"/>
 			<param name="energy-level" value="15"/>
@@ -220,7 +220,7 @@
 			<param name="muted-sound" value="conference/conf-muted.wav"/>
 			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
 			<param name="alone-sound" value="conference/conf-alone.wav"/>
-			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="moh-sound" value="local_stream://default"/>
 			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
 			<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
 			<param name="kicked-sound" value="conference/conf-kicked.wav"/>
@@ -229,15 +229,15 @@
 			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
 			<param name="pin-sound" value="conference/conf-pin.wav"/>
 			<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-			<param name="caller-id-name" value="$${outbound_caller_name}"/>
-			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="caller-id-name" value=""/>
+			<param name="caller-id-number" value=""/>
 			<param name="comfort-noise" value="true"/>
 			<!--<param name="tts-engine" value="flite"/>-->
 			<!--<param name="tts-voice" value="kal16"/>-->
 		</profile>
 
 		<profile name="cdquality">
-			<param name="domain" value="$${domain}"/>
+			<param name="domain" value=""/>
 			<param name="rate" value="48000"/>
 			<param name="interval" value="10"/>
 			<param name="energy-level" value="15"/>
@@ -248,7 +248,7 @@
 			<param name="muted-sound" value="conference/conf-muted.wav"/>
 			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
 			<param name="alone-sound" value="conference/conf-alone.wav"/>
-			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="moh-sound" value="local_stream://default"/>
 			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
 			<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
 			<param name="kicked-sound" value="conference/conf-kicked.wav"/>
@@ -257,13 +257,13 @@
 			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
 			<param name="pin-sound" value="conference/conf-pin.wav"/>
 			<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-			<param name="caller-id-name" value="$${outbound_caller_name}"/>
-			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="caller-id-name" value=""/>
+			<param name="caller-id-number" value=""/>
 			<param name="comfort-noise" value="true"/>
 		</profile>
 
 		<profile name="sla">
-			<param name="domain" value="$${domain}"/>
+			<param name="domain" value=""/>
 			<param name="rate" value="16000"/>
 			<param name="interval" value="20"/>
 			<param name="caller-controls" value="none"/>
@@ -273,7 +273,7 @@
 		</profile>
 
 		<profile name="page">
-			<param name="domain" value="$${domain}"/>
+			<param name="domain" value=""/>
 			<param name="rate" value="8000"/>
 			<param name="interval" value="20"/>
 			<param name="energy-level" value="300"/>
@@ -286,8 +286,8 @@
 			<param name="locked-sound" value="conference/conf-locked.wav"/>
 			<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
 			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-			<param name="caller-id-name" value="$${outbound_caller_name}"/>
-			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="caller-id-name" value=""/>
+			<param name="caller-id-number" value=""/>
 			<param name="comfort-noise" value="true"/>
 		</profile>