import ceph 16.2.6

[ceph.git] / ceph / doc / radosgw / frontends.rst

diff --git a/ceph/doc/radosgw/frontends.rst b/ceph/doc/radosgw/frontends.rst
index e4a013590851c06fbe815352bd7e551c42d94791..274cdce876b4be63697d4539d64c8ec7a4209b96 100644 (file)
--- a/ceph/doc/radosgw/frontends.rst
+++ b/ceph/doc/radosgw/frontends.rst
@@ -64,6 +64,38 @@ Options
 :Type: String
 :Default: None
 
+``ssl_options``
+
+:Description: Optional colon separated list of ssl context options:
+
+              ``default_workarounds`` Implement various bug workarounds.
+
+              ``no_compression`` Disable compression.
+
+              ``no_sslv2`` Disable SSL v2.
+
+              ``no_sslv3`` Disable SSL v3.
+
+              ``no_tlsv1`` Disable TLS v1.
+
+              ``no_tlsv1_1`` Disable TLS v1.1.
+
+              ``no_tlsv1_2`` Disable TLS v1.2.
+
+              ``single_dh_use`` Always create a new key when using tmp_dh parameters.
+
+:Type: String
+:Default: ``no_sslv2:no_sslv3:no_tlsv1:no_tlsv1_1``
+
+``ssl_ciphers``
+
+:Description: Optional list of one or more cipher strings separated by colons.
+              The format of the string is described in openssl's ciphers(1)
+              manual.
+
+:Type: String
+:Default: None
+
 ``tcp_nodelay``
 
 :Description: If set the socket option will disable Nagle's algorithm on 
@@ -100,6 +132,7 @@ Civetweb
 ========
 
 .. versionadded:: Firefly
+.. deprecated:: Pacific
 
 The ``civetweb`` frontend uses the Civetweb HTTP library, which is a
 fork of Mongoose.