FS-7648 clean 2

diff --git a/conf/testing/dialplan/default/0000_local_extensions.xml b/conf/testing/dialplan/default/0000_local_extensions.xml
index 3ffeab85441c0423a594f1f283e98ff2f1522899..0870d53d2f8137963f32068f0dab971b351328d7 100644 (file)
--- a/conf/testing/dialplan/default/0000_local_extensions.xml
+++ b/conf/testing/dialplan/default/0000_local_extensions.xml
@@ -5,7 +5,7 @@
     <action application="bridge" data="user/$1@${domain_name}"/>
     <action application="answer"/>
     <action application="sleep" data="1000"/>
-    <action application="bridge" data="loopback/app=voicemail:default $1 ${dialed_extension}"/>
+    <action application="bridge" data="loopback/app=voicemail:default ${domain_name} $1"/>
   </condition>
 </extension>
   

diff --git a/conf/testing/sip_profiles/external-ipv6.xml b/conf/testing/sip_profiles/external-ipv6.xml
index 7dc5906c5f1eeba918080c04654bfa35bb9e6ee7..be6e65efe4e82c07814953bab95a29a1379c54b1 100644 (file)
--- a/conf/testing/sip_profiles/external-ipv6.xml
+++ b/conf/testing/sip_profiles/external-ipv6.xml
@@ -1,15 +1,9 @@
 <profile name="external-ipv6">
-  <!-- http://wiki.freeswitch.org/wiki/Sofia_Configuration_Files -->
-  <!-- This profile is only for outbound registrations to providers -->
   <gateways>
-    <X-PRE-PROCESS cmd="include" data="external-ipv6/*.xml"/>
+    <NO-PRE-PROCESS cmd="include" data="external-ipv6/*.xml"/>
   </gateways>
 
   <aliases>
-    <!--
-        <alias name="outbound"/>
-        <alias name="nat"/>
-    -->
   </aliases>
 
   <domains>

diff --git a/conf/testing/sip_profiles/external.xml b/conf/testing/sip_profiles/external.xml
index 6edc878c06687a4fc262fccd9bb0f50e09c2c6e0..faaffad2e7c033d910b173d9b3dbcda12decef1e 100644 (file)
--- a/conf/testing/sip_profiles/external.xml
+++ b/conf/testing/sip_profiles/external.xml
@@ -2,7 +2,7 @@
   <!-- http://wiki.freeswitch.org/wiki/Sofia_Configuration_Files -->
   <!-- This profile is only for outbound registrations to providers -->
   <gateways>
-    <X-PRE-PROCESS cmd="include" data="external/*.xml"/>
+    <NOPRE-PROCESS cmd="include" data="external/*.xml"/>
   </gateways>
 
   <aliases>