Skip to content

Commit d5f7b3a

Browse files
Correct a rabbitmq.conf key renamed before 4.0 GA shipped rabbitmq/rabbitmq-server#12595
1 parent d686164 commit d5f7b3a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

docs/mqtt.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ The acceptable values are:
609609
* `subject_alternative_name`: the Subject Alternative Name or SAN, which comes from a certificate's extensions section
610610
Because different ypes of Subject Alternative Names exist, the type may need to be specified as well
611611

612-
If `mqtt.ssl_cert_client_id_from` is set to `subject_alternative_name`, the type of alternative name can be configured using `mqtt.ssl_cert_client_id_san_type`. The default type, used if the setting
612+
If `mqtt.ssl_cert_client_id_from` is set to `subject_alternative_name`, the type of alternative name can be configured using `mqtt.ssl_cert_login_san_type`. The default type, used if the setting
613613
is omitted, is `dns`. The acceptable values are:
614614

615615
* `dns`
@@ -618,16 +618,16 @@ is omitted, is `dns`. The acceptable values are:
618618
* `uri`
619619
* `other_name`
620620

621-
A certificate can contain multiple SAN fields of the same type, for example, two alternative DNS names. If this is the case, use the `mqtt.ssl_cert_client_id_san_index` configuration key
622-
to specify the index to be used. By default, RabbitMQ will pick the first value, that is, the default value of `mqtt.ssl_cert_client_id_san_index` is `0`.
621+
A certificate can contain multiple SAN fields of the same type, for example, two alternative DNS names. If this is the case, use the `mqtt.ssl_cert_login_san_index` configuration key
622+
to specify the index to be used. By default, RabbitMQ will pick the first value, that is, the default value of `mqtt.ssl_cert_login_san_index` is `0`.
623623

624624
Below an example where the username is extracted from the certificate's distinguished name and the `client_id` is extracted from
625625
the first SAN (Subject Alternative Name) of type `uri`:
626626

627627
```ini
628628
ssl_cert_login_from = distinguished_name
629629
mqtt.ssl_cert_client_id_from = subject_alternative_name
630-
mqtt.ssl_cert_client_id_san_type = uri
630+
mqtt.ssl_cert_login_san_type = uri
631631
```
632632

633633
### [Flow Control](https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901251) {#flow}

versioned_docs/version-4.0/mqtt.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ The acceptable values are:
609609
* `subject_alternative_name`: the Subject Alternative Name or SAN, which comes from a certificate's extensions section
610610
Because different ypes of Subject Alternative Names exist, the type may need to be specified as well
611611

612-
If `mqtt.ssl_cert_client_id_from` is set to `subject_alternative_name`, the type of alternative name can be configured using `mqtt.ssl_cert_client_id_san_type`. The default type, used if the setting
612+
If `mqtt.ssl_cert_client_id_from` is set to `subject_alternative_name`, the type of alternative name can be configured using `mqtt.ssl_cert_login_san_type`. The default type, used if the setting
613613
is omitted, is `dns`. The acceptable values are:
614614

615615
* `dns`
@@ -618,16 +618,16 @@ is omitted, is `dns`. The acceptable values are:
618618
* `uri`
619619
* `other_name`
620620

621-
A certificate can contain multiple SAN fields of the same type, for example, two alternative DNS names. If this is the case, use the `mqtt.ssl_cert_client_id_san_index` configuration key
622-
to specify the index to be used. By default, RabbitMQ will pick the first value, that is, the default value of `mqtt.ssl_cert_client_id_san_index` is `0`.
621+
A certificate can contain multiple SAN fields of the same type, for example, two alternative DNS names. If this is the case, use the `mqtt.ssl_cert_login_san_index` configuration key
622+
to specify the index to be used. By default, RabbitMQ will pick the first value, that is, the default value of `mqtt.ssl_cert_login_san_index` is `0`.
623623

624624
Below an example where the username is extracted from the certificate's distinguished name and the `client_id` is extracted from
625625
the first SAN (Subject Alternative Name) of type `uri`:
626626

627627
```ini
628628
ssl_cert_login_from = distinguished_name
629629
mqtt.ssl_cert_client_id_from = subject_alternative_name
630-
mqtt.ssl_cert_client_id_san_type = uri
630+
mqtt.ssl_cert_login_san_type = uri
631631
```
632632

633633
### [Flow Control](https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901251) {#flow}

0 commit comments

Comments
 (0)