]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
doc: rgw: mention the civetweb support for binding to multiple ports 17141/head
authorAbhishek Lekshmanan <abhishek@suse.com>
Tue, 22 Aug 2017 12:03:01 +0000 (14:03 +0200)
committerAbhishek Lekshmanan <abhishek@suse.com>
Wed, 30 Aug 2017 08:48:01 +0000 (10:48 +0200)
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>
doc/install/install-ceph-gateway.rst

index cf599cd2ac8d40a04654eed73f5055cca3305d50..09fdf921e373f816c1d097de988dc32f2c0385e2 100644 (file)
@@ -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
 ---------------------------------