summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1d361ac)
raw | patch | inline | side by side (parent: 1d361ac)
author | Marc Fournier <marc.fournier@camptocamp.com> | |
Sat, 26 Jul 2014 09:30:32 +0000 (11:30 +0200) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Sat, 26 Jul 2014 09:30:32 +0000 (11:30 +0200) |
src/collectd.conf.in | patch | blob | history | |
src/collectd.conf.pod | patch | blob | history |
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index c689aaff69a497c3e6c1f126e34b8e39a9ee657c..a95945208bd0d87279615c0e0c00e2c4962cc50c 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
# VerifyPeer true
# VerifyHost true
# CACert "/etc/ssl/ca.crt"
+# CAPath "/etc/ssl/certs/"
+# ClientKey "/etc/ssl/client.pem"
+# ClientCert "/etc/ssl/client.crt"
+# ClientKeyPass "secret"
+# SSLVersion "TLSv1"
# Format "Command"
# StoreRates false
# </URL>
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 8d05e9a07101689c7987571441a32e4a765a6be3..008c1589d38817358f56be848f4c339c8325756c 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -6408,6 +6408,33 @@ File that holds one or more SSL certificates. If you want to use HTTPS you will
possibly need this option. What CA certificates come bundled with C<libcurl>
and are checked by default depends on the distribution you use.
+=item B<CAPath> I<Directory>
+
+Directory holding one or more CA certificate files. You can use this if for
+some reason all the needed CA certificates aren't in the same file and can't be
+pointed to using the B<CACert> option. Requires C<libcurl> to be built against
+OpenSSL.
+
+=item B<ClientKey> I<File>
+
+File that holds the private key in PEM format to be used for certificate-based
+authentication.
+
+=item B<ClientCert> I<File>
+
+File that holds the SSL certificate to be used for certificate-based
+authentication.
+
+=item B<ClientKeyPass> I<Password>
+
+Password required to load the private key in B<ClientKey>.
+
+=item B<SSLVersion> B<SSLv2>|B<SSLv3>|B<TLSv1>|B<TLSv1_0>|B<TLSv1_1>|B<TLSv1_2>
+
+Define which SSL protocol version must be used. By default C<libcurl> will
+attempt to figure out the remote SSL protocol version. See
+L<curl_easy_setopt(3)> for more details.
+
=item B<Format> B<Command>|B<JSON>
Format of the output to generate. If set to B<Command>, will create output that