doc: rgw: mention the civetweb support for binding to multiple ports

We support binding multiple ports in civetweb after the upgrade to 1.8,
clarify this in the documentation as well

Fixes: http://tracker.ceph.com/issues/20942
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 01740c6a6c1ae523ac73c24235be0e4cef71e21c)

diff --git a/doc/install/install-ceph-gateway.rst b/doc/install/install-ceph-gateway.rst
index 8c4d96d3b2e855c2801e674aedb785921aa0e4d1..dc1178e5a995bdcce171d713adb3c60327e92ac3 100644 (file)
--- a/doc/install/install-ceph-gateway.rst
+++ b/doc/install/install-ceph-gateway.rst
@@ -159,13 +159,21 @@ CA or intermediate certificates be supplied in one file.  Each of these
 items must be in `pem` form.  Because the combined file contains the
 secret key, it should be protected from unauthorized access.
 
-To configure ssl operation, append ``s`` to the port number.  Currently
-it is not possible to configure the radosgw to listen on both
-http and https, you must pick only one.  So::
+To configure ssl operation, append ``s`` to the port number. For eg::
 
  [client.rgw.gateway-node1]
  rgw_frontends = civetweb port=443s ssl_certificate=/etc/ceph/private/keyandcert.pem
 
+.. versionadded :: Luminous
+
+Furthermore, civetweb can be made to bind to multiple ports, by separating them
+with ``+`` in the configuration. This allows for use cases where both ssl and
+non-ssl connections are hosted by a single rgw instance. For eg::
+
+ [client.rgw.gateway-node1]
+ rgw_frontends = civetweb port=80+443s ssl_certificate=/etc/ceph/private/keyandcert.pem
+
+
 Migrating from Apache to Civetweb
 ---------------------------------