From 4eb64cb107c14ef5a89dba9ef97d24667fc1341d Mon Sep 17 00:00:00 2001
From: Russell Treleaven <rtreleaven@bunnykick.ca>
Date: Thu, 25 Sep 2014 14:05:44 -0400
Subject: [PATCH 1/2] 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
---
 conf/vanilla/sip_profiles/external-ipv6.xml                | 2 +-
 .../sip_profiles/{internal => external-ipv6}/example.xml   | 7 ++++---
 conf/vanilla/sip_profiles/internal.xml                     | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename conf/vanilla/sip_profiles/{internal => external-ipv6}/example.xml (90%)

diff --git a/conf/vanilla/sip_profiles/external-ipv6.xml b/conf/vanilla/sip_profiles/external-ipv6.xml
index 6182246763..7dc5906c5f 100644
--- 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 a5cbd7d2b7..0497bcd1e1 100644
--- 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 9e6a93ae2a..a848cb9583 100644
--- 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>

From e4f77140d2aebef47671dd3b2f028930c7ee1f86 Mon Sep 17 00:00:00 2001
From: Russell Treleaven <rtreleaven@bunnykick.ca>
Date: Fri, 26 Sep 2014 13:54:52 -0400
Subject: [PATCH 2/2] make the gateway parameters to make the gateways samples
 the same

It was noticed that the sample gateways were diferent. Brian West
suggest that I merge all the parameters into both examples.
fs-6859
---
 conf/vanilla/sip_profiles/external-ipv6/example.xml | 5 ++++-
 conf/vanilla/sip_profiles/external/example.xml      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/conf/vanilla/sip_profiles/external-ipv6/example.xml b/conf/vanilla/sip_profiles/external-ipv6/example.xml
index 0497bcd1e1..d8fe39539a 100644
--- a/conf/vanilla/sip_profiles/external-ipv6/example.xml
+++ b/conf/vanilla/sip_profiles/external-ipv6/example.xml
@@ -28,11 +28,14 @@
   <!--<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"/>-->
-  <!--</gateway>-->
+  <!--<param name="cid-type" value="rpid"/>-->
   <!--rfc5626 : Abilitazione rfc5626 ///-->
   <!--<param name="rfc-5626" value="true"/>-->
   <!--rfc5626 : extra sip params to send in the contact-->
   <!--<param name="reg-id" value="1"/>-->
+  <!--</gateway>-->
 </include>
diff --git a/conf/vanilla/sip_profiles/external/example.xml b/conf/vanilla/sip_profiles/external/example.xml
index 0497bcd1e1..d8fe39539a 100644
--- a/conf/vanilla/sip_profiles/external/example.xml
+++ b/conf/vanilla/sip_profiles/external/example.xml
@@ -28,11 +28,14 @@
   <!--<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"/>-->
-  <!--</gateway>-->
+  <!--<param name="cid-type" value="rpid"/>-->
   <!--rfc5626 : Abilitazione rfc5626 ///-->
   <!--<param name="rfc-5626" value="true"/>-->
   <!--rfc5626 : extra sip params to send in the contact-->
   <!--<param name="reg-id" value="1"/>-->
+  <!--</gateway>-->
 </include>