From 8e90e5433f2f2de09eaea5f83d2fdfe4992ed646 Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Wed, 15 Jul 2009 16:54:20 +0000
Subject: [PATCH]  config file changes ONLY from XML-5

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14259 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 conf/autoload_configs/xml_cdr.conf.xml  | 29 ++++++++++++++++++++---
 conf/autoload_configs/xml_curl.conf.xml | 31 ++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/conf/autoload_configs/xml_cdr.conf.xml b/conf/autoload_configs/xml_cdr.conf.xml
index 7f635d64aa..6964a79757 100644
--- a/conf/autoload_configs/xml_cdr.conf.xml
+++ b/conf/autoload_configs/xml_cdr.conf.xml
@@ -34,9 +34,32 @@
     <!-- either an absolute path, a relative path assuming ${prefix}/logs or a blank or omitted value will default to ${prefix}/logs/xml_cdr -->
     <!-- <param name="err-log-dir" value="/tmp"/> -->
 
-    <!-- optional: if enabled this will disable CA root certificate checks by libcurl -->
-    <!-- note: default value is disabled. only enable if you want this! -->
-    <!-- <param name="ignore-cacert-check" value="true" /> -->
+    <!-- optional: this will enable the CA root certificate check by libcurl to
+         verify that the certificate was issued by a major Certificate Authority.
+         note: default value is disabled. only enable if you want this! -->
+    <!--<param name="enable-cacert-check" value="true"/>-->
+    <!-- optional: verify that the server is actually the one listed in the cert -->
+    <!-- <param name="enable-ssl-verifyhost" value="true"/> -->
 
+    <!-- optional: these options can be used to specify custom SSL certificates
+         to use for HTTPS communications. Either use both options or neither.
+         Specify your public key with 'ssl-cert-path' and the private key with
+         'ssl-key-path'. If your private key has a password, specify it with
+         'ssl-key-password'. -->
+    <!-- <param name="ssl-cert-path" value="$${base_dir}/conf/certs/public_key.pem"/> -->
+    <!-- <param name="ssl-key-path" value="$${base_dir}/conf/certs/private_key.pem"/> -->
+    <!-- <param name="ssl-key-password" value="MyPrivateKeyPassword"/> -->
+
+    <!-- optional: use a custom CA certificate in PEM format to verify the peer
+         with. This is useful if you are acting as your own certificate authority.
+         note: only makes sense if used in combination with "enable-cacert-check." -->
+    <!-- <param name="ssl-cacert-file" value="$${base_dir}/conf/certs/cacert.pem"/> -->
+
+    <!-- optional: specify the SSL version to force HTTPS to use. Valid options are
+         "SSLv3" and "TLSv1". Otherwise libcurl will auto-negotiate the version. -->
+    <!-- <param name="ssl-version" value="TLSv1"/> -->
+
+    <!-- optional: enables cookies and stores them in the specified file. -->
+    <!-- <param name="cookie-file" value="/tmp/cookie-mod_xml_curl.txt"/> -->
   </settings>
 </configuration>
diff --git a/conf/autoload_configs/xml_curl.conf.xml b/conf/autoload_configs/xml_curl.conf.xml
index c4f3f9b63c..1dbd34de0c 100644
--- a/conf/autoload_configs/xml_curl.conf.xml
+++ b/conf/autoload_configs/xml_curl.conf.xml
@@ -11,9 +11,34 @@
       <!-- set to true to disable Expect: 100-continue lighttpd requires this setting -->
       <!--<param name="disable-100-continue" value="true"/>-->
 
-      <!-- optional: if enabled this will disable CA root certificate checks by libcurl -->
-      <!-- note: default value is disabled. only enable if you want this! -->
-      <!-- <param name="ignore-cacert-check" value="true" /> -->
+      <!-- optional: this will enable the CA root certificate check by libcurl to
+           verify that the certificate was issued by a major Certificate Authority.
+           note: default value is disabled. only enable if you want this! -->
+      <!--<param name="enable-cacert-check" value="true"/>-->
+      <!-- optional: verify that the server is actually the one listed in the cert -->
+      <!-- <param name="enable-ssl-verifyhost" value="true"/> -->
+
+      <!-- optional: these options can be used to specify custom SSL certificates
+           to use for HTTPS communications. Either use both options or neither.
+           Specify your public key with 'ssl-cert-path' and the private key with
+           'ssl-key-path'. If your private key has a password, specify it with
+           'ssl-key-password'. -->
+      <!-- <param name="ssl-cert-path" value="$${base_dir}/conf/certs/public_key.pem"/> -->
+      <!-- <param name="ssl-key-path" value="$${base_dir}/conf/certs/private_key.pem"/> -->
+      <!-- <param name="ssl-key-password" value="MyPrivateKeyPassword"/> -->
+
+      <!-- optional: use a custom CA certificate in PEM format to verify the peer
+           with. This is useful if you are acting as your own certificate authority.
+           note: only makes sense if used in combination with "enable-cacert-check." -->
+      <!-- <param name="ssl-cacert-file" value="$${base_dir}/conf/certs/cacert.pem"/> -->
+
+      <!-- optional: specify the SSL version to force HTTPS to use. Valid options are
+           "SSLv3" and "TLSv1". Otherwise libcurl will auto-negotiate the version. -->
+      <!-- <param name="ssl-version" value="TLSv1"/> -->
+
+      <!-- optional: enables cookies and stores them in the specified file. -->
+      <!-- <param name="cookie-file" value="/tmp/cookie-mod_xml_curl.txt"/> -->
+
       <!-- one or more of these imply you want to pick the exact variables that are transmitted -->
       <!--<param name="enable-post-var" value="Unique-ID"/>-->
     </binding>