3.0 iproto uri params #3973
Merged
3.0 iproto uri params #3973
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andreyaksenov
force-pushed
the
3.0-iproto-uri-params
branch
16 times, most recently
from
a7f4371 to
d980733
Compare
andreyaksenov
force-pushed
the
3.0-iproto-uri-params
branch
8 times, most recently
from
9e14ca9 to
332e7f6
Compare
andreyaksenov
force-pushed
the
3.0-iproto-uri-params
branch
4 times, most recently
from
54ca263 to
576a8ef
Compare
andreyaksenov
force-pushed
the
3.0-iproto-uri-params
branch
from
576a8ef to
cbf9a78
Compare
andreyaksenov
force-pushed
the
3.0-iproto-uri-params
branch
from
cbf9a78 to
ede55c0
Compare
andreyaksenov
force-pushed
the
3.0-iproto-uri-params
branch
from
ede55c0 to
e1c677e
Compare
p7nov
approved these changes
Jan 10, 2024
| @@ -619,7 +619,8 @@ iproto.advertise.<peer_or_sharding>.* | |||
|
|
|||
| .. confval:: iproto_advertise.<peer_or_sharding>.uri | |||
|
|
|||
| An URI used to advertise the current instance. | |||
| (Optional) An URI used to advertise the current instance. | |||
There was a problem hiding this comment.
Suggested change
| (Optional) An URI used to advertise the current instance. | |
| (Optional) A URI used to advertise the current instance. |
There was a problem hiding this comment.
Thanks, also fixed in other places
| @@ -634,7 +635,8 @@ iproto.advertise.<peer_or_sharding>.* | |||
|
|
|||
| .. confval:: iproto_advertise.<peer_or_sharding>.login | |||
|
|
|||
| A username that should be used to connect to the current instance. | |||
| (Optional) A username that should be used to connect to the current instance. | |||
There was a problem hiding this comment.
Suggested change
| (Optional) A username that should be used to connect to the current instance. | |
| (Optional) A username used for connecting to the current instance. |
Feel free to ignore this edit if it changes the meaning.
There was a problem hiding this comment.
Changed to A username used to connect to the current instance.
| A password for the specified user. | ||
| If a password is missing, it is taken from :ref:`credentials <configuration_reference_credentials>` for the specified username. | ||
| (Optional) A password for the specified user. | ||
| If ``login`` is specified but a password is missing, it is taken from :ref:`credentials <configuration_reference_credentials>` for this user. |
There was a problem hiding this comment.
Suggested change
| If ``login`` is specified but a password is missing, it is taken from :ref:`credentials <configuration_reference_credentials>` for this user. | |
| If a ``login`` is specified but a password is missing, it is taken from the user's :ref:`credentials <configuration_reference_credentials>`. |
| - ``ssl_cert_file``: a path to an SSL certificate file. | ||
| - ``ssl_key_file``: a path to a private SSL key file. | ||
| - ``ssl_password`` (``instance001``): a password for an encrypted private SSL key. | ||
| For ``instance002`` and ``instance003``, passwords for encrypted SSL keys are provided in ``ssl_password_file``. |
There was a problem hiding this comment.
Maybe make ssl_password_file a separate list item for better visibility?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Created a runnable sample with SSL enabled for all instances:
The config from this sample is included to the
<uri>.params.transportoption description.Documented all options in
<uri>.params.*:Options descriptions are taken from Traffic encryption with some cosmetic changes.
Note
The
Traffic encryptionsection will be updated to the new config and moved to the Configuration section when working on the #3665 issue.Updated some existing descriptions:
iproto_advertise.<peer_or_sharding>.uri: https://docs.d.tarantool.io/en/doc/3.0-iproto-uri-params/reference/configuration/configuration_reference/#iproto-advertise-peer-or-shardingiproto.listen: https://docs.d.tarantool.io/en/doc/3.0-iproto-uri-params/reference/configuration/configuration_reference/#configuration-reference-iproto-miscUpdated the
net.boxsample (includes code from the new SSL sample):