From f987903e5ee275ff4afd27245f322e4b8d9eb8f3 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 24 Nov 2010 21:36:21 -0600
Subject: [PATCH] fix single domain assumption in default config to be more
 portable *cough* bkw *cough*

---
 conf/dialplan/default.xml  | 2 +-
 conf/directory/default.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 42a3bcc31f..a19f68399e 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -265,7 +265,7 @@
 	<action application="set" data="called_party_callgroup=${user_data(${dialed_extension}@${domain_name} var callgroup)}"/>
 	<!--<action application="export" data="nolocal:sip_secure_media=${user_data(${dialed_extension}@${domain_name} var sip_secure_media)}"/>-->
 	<action application="hash" data="insert/${domain_name}-last_dial/${called_party_callgroup}/${uuid}"/>
-	<action application="bridge" data="{sip_invite_domain=$${domain}}user/${dialed_extension}@${domain_name}"/>
+	<action application="bridge" data="user/${dialed_extension}@${domain_name}"/>
 	<action application="answer"/>
 	<action application="sleep" data="1000"/>
 	<action application="bridge" data="loopback/app=voicemail:default ${domain_name} ${dialed_extension}"/>
diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index 1e583033a9..8af7aea135 100644
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -21,7 +21,7 @@
   <!--the domain or ip (the right hand side of the @ in the addr-->
   <domain name="$${domain}">
     <params>
-      <param name="dial-string" value="{presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}"/>
+      <param name="dial-string" value="{sip_invite_domain=${dialed_domain},presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}"/>
     </params>
 
     <variables>