make vanilla configuration gateways easier to understand for new users

having the same gateway definition bound to the ipv6 and ipv4 external
profiles caused confusion for some new users. Also having a gateway
bound to the internal profile was a bit confusing.
fs-6859

diff --git a/conf/vanilla/sip_profiles/external-ipv6.xml b/conf/vanilla/sip_profiles/external-ipv6.xml
index 618224676364f8533d7a9abbf8f37bb5854ccac1..7dc5906c5f1eeba918080c04654bfa35bb9e6ee7 100644 (file)
--- a/conf/vanilla/sip_profiles/external-ipv6.xml
+++ b/conf/vanilla/sip_profiles/external-ipv6.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"/>
+    <X-PRE-PROCESS cmd="include" data="external-ipv6/*.xml"/>
   </gateways>
 
   <aliases>

diff --git a/conf/vanilla/sip_profiles/internal/example.xml b/conf/vanilla/sip_profiles/external-ipv6/example.xml
similarity index 90%
rename from conf/vanilla/sip_profiles/internal/example.xml
rename to conf/vanilla/sip_profiles/external-ipv6/example.xml
index a5cbd7d2b70c80c5f7303271f34b27abcd2668b0..0497bcd1e1136a85a97f686046f5e900b155a547 100644 (file)
--- a/conf/vanilla/sip_profiles/internal/example.xml
+++ b/conf/vanilla/sip_profiles/external-ipv6/example.xml
@@ -28,10 +28,11 @@
   <!--<param name="caller-id-in-from" value="false"/>-->
   <!--extra sip params to send in the contact-->
   <!--<param name="contact-params" value=""/>-->
-  <!-- Put the extension in the contact -->
-  <!--<param name="extension-in-contact" value="true"/>-->
   <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
   <!--<param name="ping" value="25"/>-->
-  <!--<param name="cid-type" value="rpid"/>-->
   <!--</gateway>-->
+  <!--rfc5626 : Abilitazione rfc5626 ///-->
+  <!--<param name="rfc-5626" value="true"/>-->
+  <!--rfc5626 : extra sip params to send in the contact-->
+  <!--<param name="reg-id" value="1"/>-->
 </include>

diff --git a/conf/vanilla/sip_profiles/internal.xml b/conf/vanilla/sip_profiles/internal.xml
index 9e6a93ae2a2f017ec0f6eddb2e700af194afd949..a848cb9583f2e4a02e5bf59756906b78965d371c 100644 (file)
--- a/conf/vanilla/sip_profiles/internal.xml
+++ b/conf/vanilla/sip_profiles/internal.xml
@@ -15,7 +15,6 @@
   </aliases>
   <!-- Outbound Registrations -->
   <gateways>
-    <X-PRE-PROCESS cmd="include" data="internal/*.xml"/>
   </gateways>
 
   <domains>