From 1e1760934d409b21b746dbeaf4d4703282dbb10a Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Thu, 9 Oct 2008 01:13:40 +0000
Subject: [PATCH] more tweaks to the default configs \;\)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9906 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 conf/sip_profiles/external.xml |  6 +++---
 conf/sip_profiles/internal.xml |  6 +++---
 conf/vars.xml                  | 11 +++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/conf/sip_profiles/external.xml b/conf/sip_profiles/external.xml
index d2b7e84053..2e93dc2ebb 100644
--- a/conf/sip_profiles/external.xml
+++ b/conf/sip_profiles/external.xml
@@ -57,15 +57,15 @@
     <!--<param name="enable-3pcc" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
-    <param name="tls" value="false"/>
+    <param name="tls" value="$${external_ssl_enable}"/>
     <!-- additional bind parameters for TLS -->
     <param name="tls-bind-params" value="transport=tls"/>
     <!-- Port to listen on for TLS requests. (5061 will be used if unspecified) -->
     <param name="tls-sip-port" value="5081"/>
     <!-- Location of the agent.pem and cafile.pem ssl certificates (needed for TLS server) -->
-    <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/>
+    <param name="tls-cert-dir" value="$${external_ssl_dir}"/>
     <!-- TLS version ("sslv23" (default), "tlsv1"). NOTE: Phones may not work with TLSv1 -->
-    <param name="tls-version" value="tlsv1"/>
+    <param name="tls-version" value="$${sip_tls_version}"/>
 
   </settings>
 </profile>
diff --git a/conf/sip_profiles/internal.xml b/conf/sip_profiles/internal.xml
index a1a2023853..1b177188f1 100644
--- a/conf/sip_profiles/internal.xml
+++ b/conf/sip_profiles/internal.xml
@@ -84,15 +84,15 @@
     <!--<param name="unregister-on-options-fail" value="true"/>-->
 
     <!-- TLS: disabled by default, set to "true" to enable -->
-    <param name="tls" value="false"/>
+    <param name="tls" value="$${internal_ssl_enable}"/>
     <!-- additional bind parameters for TLS -->
     <param name="tls-bind-params" value="transport=tls"/>
     <!-- Port to listen on for TLS requests. (5061 will be used if unspecified) -->
     <param name="tls-sip-port" value="5061"/>
     <!-- Location of the agent.pem and cafile.pem ssl certificates (needed for TLS server) -->
-    <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/>
+    <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>
     <!-- TLS version ("sslv23" (default), "tlsv1"). NOTE: Phones may not work with TLSv1 -->
-    <param name="tls-version" value="tlsv1"/>
+    <param name="tls-version" value="$${sip_tls_version}"/>
     
     <!--If you don't want to pass through timestampes from 1 RTP call to another (on a per call basis with rtp_rewrite_timestamps chanvar)-->
     <!--<param name="rtp-rewrite-timestamps" value="true"/>-->
diff --git a/conf/vars.xml b/conf/vars.xml
index 8549a53cad..23cedb8c82 100644
--- a/conf/vars.xml
+++ b/conf/vars.xml
@@ -124,3 +124,14 @@
   <!-- true or false -->
   <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/>
   <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/>
+
+  <!--
+      TLS default settings
+  -->
+  <X-PRE-PROCESS cmd="set" data="sip_tls_version=tlsv1"/>
+  <!-- Internal SIP Profile -->
+  <X-PRE-PROCESS cmd="set" data="internal_ssl_enable=false"/>
+  <X-PRE-PROCESS cmd="set" data="internal_ssl_dir=$${base_dir}/conf/ssl"/>
+  <!-- External SIP Profile -->
+  <X-PRE-PROCESS cmd="set" data="external_ssl_enable=false"/>
+  <X-PRE-PROCESS cmd="set" data="external_ssl_dir=$${base_dir}/conf/ssl"/>