clean up configs and put wan.auto in by default commented out

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

diff --git a/conf/jingle_profiles/client.noload b/conf/jingle_profiles/client.noload
deleted file mode 100644 (file)
index 800d9d2..0000000
--- a/conf/jingle_profiles/client.noload
+++ /dev/null
@@ -1,29 +0,0 @@
-<include>
-  <!-- Client Profile (Original mode) -->
-  <profile type="client">
-    <param name="name" value="%JABBERCLIENTNAME%"/>
-    <param name="login" value="%JABBERLOGIN%/%JABBERRESOURCE%"/>
-    <param name="password" value="%JABBERPASSWORD%"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="message" value="Jingle all the way"/>
-    <param name="rtp-ip" value="$${bind_server_ip}"/>
-    <!-- <param name="ext-rtp-ip" value="$${external_rtp_ip"/> -->
-    <param name="auto-login" value="true"/>
-    <!-- SASL "plain" or "md5" -->
-    <param name="sasl" value="plain"/>
-    <!-- if the server where the jabber is hosted is not the same as the one in the jid -->
-    <!--<param name="server" value="alternate.server.com"/>-->
-    <!-- Enable TLS or not -->
-    <param name="tls" value="true"/>
-    <!-- disable to trade async for more calls -->
-    <param name="use-rtp-timer" value="true"/>
-    <!-- default extension (if one cannot be determined) -->
-    <param name="exten" value="888"/>
-    <!-- VAD choose one -->
-    <!-- <param name="vad" value="in"/> -->
-    <!-- <param name="vad" value="out"/> -->
-    <param name="vad" value="both"/>
-    <!--<param name="avatar" value="%JABBERAVATAR%"/>-->
-  </profile>
-</include>

diff --git a/conf/jingle_profiles/client.xml b/conf/jingle_profiles/client.xml
index e527c19154b20a91e000a13a8e923d60aefbc6e7..06ab1f3374c9ed20e2817e262e7ceb91930fd5d2 100644 (file)
--- a/conf/jingle_profiles/client.xml
+++ b/conf/jingle_profiles/client.xml
@@ -26,6 +26,6 @@
     <!-- <param name="vad" value="out"/> -->
     <param name="vad" value="both"/>
     <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
-    <!--<param name="candidate-acl" value="rfc1918.auto"/>-->
+    <!--<param name="candidate-acl" value="wan.auto"/>-->
   </x-profile>
 </include>

diff --git a/conf/jingle_profiles/server.noload b/conf/jingle_profiles/server.noload
deleted file mode 100644 (file)
index 4e9e496..0000000
--- a/conf/jingle_profiles/server.noload
+++ /dev/null
@@ -1,19 +0,0 @@
-<include>
-  <!-- Component (Server to Server Login) -->
-  <profile type="component">
-    <param name="name" value="%JABBERPROFILENAME%"/>
-    <param name="password" value="secret"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="rtp-ip" value="$${bind_server_ip}"/>
-    <param name="server" value="%JABBERSERVER%:%JABBERPORT%"/>
-    <!-- disable to trade async for more calls -->
-    <param name="use-rtp-timer" value="true"/>
-    <!-- "_auto_" means the extension will be automaticly set to the called jid -->
-    <param name="exten" value="_auto_"/>
-    <!--<param name="vad" value="both"/>-->
-    <!--<param name="avatar" value="%JABBERAVATAR%%"/>-->
-    <!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
-    <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
-  </profile>
-</include>

diff --git a/conf/jingle_profiles/server.xml b/conf/jingle_profiles/server.xml
index 9fcd6412377d246b9f256c17915e6973ff9ae500..b60dc27ea6d9eeec37bc5a28faecd2ee437114e8 100644 (file)
--- a/conf/jingle_profiles/server.xml
+++ b/conf/jingle_profiles/server.xml
@@ -16,6 +16,6 @@
     <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
     <!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
     <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
-    <!--<param name="candidate-acl" value="rfc1918.auto"/>-->
+    <!--<param name="candidate-acl" value="wan.auto"/>-->
   </x-profile>
 </include>