config:Remove use_profile from default dialplan, move to vars.xml, default value...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13874 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index a79f03e5d427bb1363d44ccbff3e962c3fff814a..eb0a1a8f3e43005bedc6eaf16491279d7467e784 100644 (file)
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -60,10 +60,6 @@
     </extension>
 
     <extension name="global" continue="true">
-      <condition field="${network_addr}" expression="^$" break="never">
-       <action application="set" data="use_profile=${cond(${acl($${local_ip_v4} rfc1918)} == true ? nat : default)}"/>
-       <anti-action application="set" data="use_profile=${cond(${acl(${network_addr} rfc1918)} == true ? nat : default)}"/>
-      </condition>
       <condition field="${call_debug}" expression="^true$" break="never">
        <action application="info"/>
       </condition>

diff --git a/conf/vars.xml b/conf/vars.xml
index 59e47c7968f835d8a44a2e545b946d69e2e94a9f..f30f8b646a23f3b056e278f0eac8bc15a418b820 100644 (file)
--- a/conf/vars.xml
+++ b/conf/vars.xml
@@ -26,6 +26,7 @@
   <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
   <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/>
   <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
+  <X-PRE-PROCESS cmd="set" data="use_profile=internal"/>
 
   <!--
       Enable ZRTP globally you can override this on a per channel basis