From 4dc7e2a2bbc1c039c2ee4066dd79c0b11e751dcb Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 3 Jun 2015 15:56:26 -0500
Subject: [PATCH] FS-7587 #comment one profile to rule them all

---
 conf/vanilla/autoload_configs/verto.conf.xml | 28 +++++---------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/conf/vanilla/autoload_configs/verto.conf.xml b/conf/vanilla/autoload_configs/verto.conf.xml
index b69777ac0a..e55359aa6d 100644
--- a/conf/vanilla/autoload_configs/verto.conf.xml
+++ b/conf/vanilla/autoload_configs/verto.conf.xml
@@ -8,25 +8,6 @@
     <profile name="default-v4">
       <param name="bind-local" value="$${local_ip_v4}:8081"/>
       <param name="bind-local" value="$${local_ip_v4}:8082" secure="true"/>
-      <param name="force-register-domain" value="$${domain}"/>
-      <param name="secure-combined" value="$${certs_dir}/wss.pem"/>
-      <param name="secure-chain" value="$${certs_dir}/wss.pem"/>
-      <param name="userauth" value="true"/>
-      <!-- setting this to true will allow anyone to register even with no account so use with care -->
-      <param name="blind-reg" value="false"/>
-      <param name="mcast-ip" value="224.1.1.1"/>
-      <param name="mcast-port" value="1337"/>
-      <param name="rtp-ip" value="$${local_ip_v4}"/>
-      <!--  <param name="ext-rtp-ip" value=""/> -->
-      <param name="local-network" value="localnet.auto"/>
-      <param name="outbound-codec-string" value="opus,vp8"/>
-      <param name="inbound-codec-string" value="opus,vp8"/>
-      <param name="apply-candidate-acl" value="wan_v4.auto"/>
-      <param name="timer-name" value="soft"/>
-      
-    </profile>
-
-    <profile name="default-v6">
       <param name="bind-local" value="[$${local_ip_v6}]:8081"/>
       <param name="bind-local" value="[$${local_ip_v6}]:8082" secure="true"/>
       <param name="force-register-domain" value="$${domain}"/>
@@ -35,17 +16,22 @@
       <param name="userauth" value="true"/>
       <!-- setting this to true will allow anyone to register even with no account so use with care -->
       <param name="blind-reg" value="false"/>
-      <param name="mcast-ip" value="ff02::1"/>
+      <param name="mcast-ip" value="224.1.1.1"/>
       <param name="mcast-port" value="1337"/>
       <param name="rtp-ip" value="$${local_ip_v6}"/>
+      <param name="rtp-ip" value="$${local_ip_v4}"/>
       <!--  <param name="ext-rtp-ip" value=""/> -->
       <param name="local-network" value="localnet.auto"/>
       <param name="outbound-codec-string" value="opus,vp8"/>
       <param name="inbound-codec-string" value="opus,vp8"/>
+      <param name="apply-candidate-acl" value="localnet.auto"/>
       <param name="apply-candidate-acl" value="wan_v6.auto"/>
+      <param name="apply-candidate-acl" value="wan_v4.auto"/>
+      <param name="apply-candidate-acl" value="rfc1918.auto"/>
+      <param name="apply-candidate-acl" value="any_v6.auto"/>
+      <param name="apply-candidate-acl" value="any_v4.auto"/>
       <param name="timer-name" value="soft"/>
       
     </profile>
   </profiles>
-
 </configuration>