fix single domain assumption in default config to be more portable *cough* bkw *cough*

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 42a3bcc31f68964ab8b0174a0aa1082b45e8f3d6..a19f68399e1df3c5c143c72bdb2bc880d6324f50 100644 (file)
--- 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 1e583033a9b15e171c67038c96643791b73c6b5f..8af7aea135fa7486f88953b1ca3ec9a849c4c406 100644 (file)
--- 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>