Merge branch 'release/3.6' into release/3.6-deploy

thingsboard · Oct 3, 2023 · 19bf067 · 19bf067
2 parents 61f2a1e + 6218ca3
commit 19bf067
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 44 deletions.
diff --git a/_includes/templates/ssl/certificates-chain.md b/_includes/templates/ssl/certificates-chain.md
@@ -6,9 +6,9 @@ ThingsBoard Team has already provisioned a valid certificate for [ThingsBoard Cl
 Follow the [MQTT over SSL](/docs/{{docsPrefix}}user-guide/mqtt-over-ssl/) guide to provision server certificate if you are hosting your own ThingsBoard instance.
 
 Once provisioned, you should prepare a certificate chain in pem format. This chain will be used by mqtt client to validate the server certificate.
-Save the chain to your working directory as {% if docsPrefix == 'paas/' %}"**tb-cloud-chain.pem**".{% else %}"**tb-server-chain.pem**".{% endif %}
+Save the chain to your working directory as {% if docsPrefix == 'paas/' %}"**tb-cloud-root-ca.pem**".{% else %}"**tb-server-chain.pem**".{% endif %}
 An example of certificate chain for *mqtt.thingsboard.cloud* is located 
-{% if docsPrefix == 'paas/' %}[here](/docs/paas/user-guide/resources/mqtt-over-ssl/tb-cloud-chain.pem).{% else %}[here](/docs/paas/user-guide/resources/mqtt-over-ssl/tb-server-chain.pem).{% endif %}
+{% if docsPrefix == 'paas/' %}[here](/docs/paas/user-guide/resources/mqtt-over-ssl/tb-cloud-root-ca.pem).{% else %}[here](/docs/paas/user-guide/resources/mqtt-over-ssl/tb-server-chain.pem).{% endif %}
 
 #### Step 2. Generate Client certificate chain
 
@@ -200,7 +200,7 @@ Execute the following command to upload temperature readings to ThingsBoard Clou
 
 {% if docsPrefix == 'paas/' %}
 ```bash
-mosquitto_pub --cafile tb-cloud-chain.pem -d -q 1 -h "mqtt.thingsboard.cloud" -p "8883" \
+mosquitto_pub --cafile tb-cloud-root-ca.pem -d -q 1 -h "mqtt.thingsboard.cloud" -p "8883" \
 -t "v1/devices/me/telemetry" --key deviceKey.pem --cert chain.pem -m {"temperature":25}
 ```
 {: .copy-code}

diff --git a/_includes/templates/ssl/certificates-leaf.md b/_includes/templates/ssl/certificates-leaf.md
@@ -6,9 +6,9 @@ ThingsBoard Team has already provisioned a valid certificate for [ThingsBoard Cl
 Follow the [MQTT over SSL](/docs/{{docsPrefix}}user-guide/mqtt-over-ssl/) guide to provision server certificate if you are hosting your own ThingsBoard instance.
 
 Once provisioned, you should prepare a certificate chain in pem format. This chain will be used by mqtt client to validate the server certificate.
-Save the chain to your working directory as {% if docsPrefix == 'paas/' %}"**tb-cloud-chain.pem**".{% else %}"**tb-server-chain.pem**".{% endif %}
+Save the chain to your working directory as {% if docsPrefix == 'paas/' %}"**tb-cloud-root-ca.pem**".{% else %}"**tb-server-chain.pem**".{% endif %}
 An example of certificate chain for *mqtt.thingsboard.cloud* is located
-{% if docsPrefix == 'paas/' %}[here](/docs/paas/user-guide/resources/mqtt-over-ssl/tb-cloud-chain.pem).{% else %}[here](/docs/paas/user-guide/resources/mqtt-over-ssl/tb-server-chain.pem).{% endif %}
+{% if docsPrefix == 'paas/' %}[here](/docs/paas/user-guide/resources/mqtt-over-ssl/tb-cloud-root-ca.pem).{% else %}[here](/docs/paas/user-guide/resources/mqtt-over-ssl/tb-server-chain.pem).{% endif %}
 
 #### Step 2. Generate Client certificate
 
@@ -45,7 +45,7 @@ Execute the following command to upload temperature readings to ThingsBoard Clou
 
 {% if docsPrefix == 'paas/' %}
 ```bash
-mosquitto_pub --cafile tb-cloud-chain.pem -d -q 1 -h "mqtt.thingsboard.cloud" -p "8883" \
+mosquitto_pub --cafile tb-cloud-root-ca.pem -d -q 1 -h "mqtt.thingsboard.cloud" -p "8883" \
 -t "v1/devices/me/telemetry" --key key.pem --cert cert.pem -m {"temperature":25}
 ```
 {: .copy-code}

diff --git a/docs/paas/user-guide/access-token.md b/docs/paas/user-guide/access-token.md
@@ -31,18 +31,18 @@ The above command uses **mqtt.thingsboard.cloud** host and **1883** port and req
 
 One-way SSL authentication is a standard authentication mode, where your client device verifies the identity of a server using server certificate.
 ThingsBoard Cloud uses a valid certificate. 
-Please download the certificate chain using this [**link**](/docs/{{docsPrefix}}user-guide/resources/mqtt-over-ssl/tb-cloud-chain.pem) 
-and save it to your working directory as "**tb-cloud-chain.pem**".
+Please download the certificate chain using this [**link**](/docs/{{docsPrefix}}user-guide/resources/mqtt-over-ssl/tb-cloud-root-ca.pem) 
+and save it to your working directory as "**tb-cloud-root-ca.pem**".
 
 ```bash
-wget https://thingsboard.io/docs/{{docsPrefix}}user-guide/resources/mqtt-over-ssl/tb-cloud-chain.pem
+wget https://thingsboard.io/docs/{{docsPrefix}}user-guide/resources/mqtt-over-ssl/tb-cloud-root-ca.pem
 ```
 {: .copy-code}
 
-Now you may use the *tb-cloud-chain.pem* to setup secure connection to ThingsBoard Cloud and Access Token *YOUR_ACCESS_TOKEN* to authenticate the device to upload telemetry:
+Now you may use the *tb-cloud-root-ca.pem* to setup secure connection to ThingsBoard Cloud and Access Token *YOUR_ACCESS_TOKEN* to authenticate the device to upload telemetry:
 
 ```bash
-mosquitto_pub --cafile tb-cloud-chain.pem -d -q 1 -h "mqtt.thingsboard.cloud" -p "8883" -t "v1/devices/me/telemetry" -u "YOUR_ACCESS_TOKEN" -m {"temperature":25}
+mosquitto_pub --cafile tb-cloud-root-ca.pem -d -q 1 -h "mqtt.thingsboard.cloud" -p "8883" -t "v1/devices/me/telemetry" -u "YOUR_ACCESS_TOKEN" -m {"temperature":25}
 ```
 {: .copy-code}
 

diff --git a/docs/paas/user-guide/basic-mqtt.md b/docs/paas/user-guide/basic-mqtt.md
@@ -81,18 +81,18 @@ The above command uses **mqtt.thingsboard.cloud** host and **1883** port and req
 
 One-way SSL authentication is a standard authentication mode, where your client device verifies the identity of a server using server certificate.
 ThingsBoard Cloud uses a valid certificate.
-Please download the certificate chain using this [**link**](/docs/{{docsPrefix}}user-guide/resources/mqtt-over-ssl/tb-cloud-chain.pem)
-and save it to your working directory as "**tb-cloud-chain.pem**".
+Please download the certificate chain using this [**link**](/docs/{{docsPrefix}}user-guide/resources/mqtt-over-ssl/tb-cloud-root-ca.pem)
+and save it to your working directory as "**tb-cloud-root-ca.pem**".
 
 ```bash
-wget https://thingsboard.io/docs/{{docsPrefix}}user-guide/resources/mqtt-over-ssl/tb-cloud-chain.pem
+wget https://thingsboard.io/docs/{{docsPrefix}}user-guide/resources/mqtt-over-ssl/tb-cloud-root-ca.pem
 ```
 {: .copy-code}
 
-Now you may use the *tb-cloud-chain.pem* to setup secure connection to ThingsBoard Cloud and Access Token *YOUR_ACCESS_TOKEN* to authenticate the device to upload telemetry:
+Now you may use the *tb-cloud-root-ca.pem* to setup secure connection to ThingsBoard Cloud and Access Token *YOUR_ACCESS_TOKEN* to authenticate the device to upload telemetry:
 
 ```bash
-mosquitto_pub --cafile tb-cloud-chain.pem -d -q 1 -h "mqtt.thingsboard.cloud" -p "8883" \
+mosquitto_pub --cafile tb-cloud-root-ca.pem -d -q 1 -h "mqtt.thingsboard.cloud" -p "8883" \
 -t "v1/devices/me/telemetry" -i "YOUR_CLIENT_ID" -u "YOUR_CLIENT_USERNAME" -P "YOUR_CLIENT_PASSWORD" -m {"temperature":25}
 ```
 {: .copy-code}

diff --git a/docs/paas/user-guide/resources/mqtt-over-ssl/tb-cloud-chain.pem b/docs/paas/user-guide/resources/mqtt-over-ssl/tb-cloud-chain.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIE1TCCBHqgAwIBAgIQX2BRt4b7Vf7RFUtkaHq4njAKBggqhkjOPQQDAjCBjzEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BxMHU2FsZm9yZDEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQDEy5T
-ZWN0aWdvIEVDQyBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMB4X
-DTIyMDkxNTAwMDAwMFoXDTIzMTAxNjIzNTk1OVowHjEcMBoGA1UEAwwTKi50aGlu
-Z3Nib2FyZC5jbG91ZDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNkK/UerQZXPP0H/
-Tl8YhRPlzW85yTAcQ5hXhs2fyXn7Bdj4EueQuZrvPw98xwHJr87jslFbS/WiSdtB
-YPvjsUyXqh7aMvOcEhSgEOWDmtoj3P1Xk1hNLb6mxAQfFL8cZ6OCAwkwggMFMB8G
-A1UdIwQYMBaAFPaFCjsRhuEEfQ6qCyzS7sxke3uuMB0GA1UdDgQWBBRr4HG23dsa
-o68r9r7obGxB70ptBzAOBgNVHQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwSQYDVR0gBEIwQDA0BgsrBgEEAbIx
-AQICBzAlMCMGCCsGAQUFBwIBFhdodHRwczovL3NlY3RpZ28uY29tL0NQUzAIBgZn
-gQwBAgEwgYQGCCsGAQUFBwEBBHgwdjBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5z
-ZWN0aWdvLmNvbS9TZWN0aWdvRUNDRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZl
-ckNBLmNydDAjBggrBgEFBQcwAYYXaHR0cDovL29jc3Auc2VjdGlnby5jb20wMQYD
-VR0RBCowKIITKi50aGluZ3Nib2FyZC5jbG91ZIIRdGhpbmdzYm9hcmQuY2xvdWQw
-ggF/BgorBgEEAdZ5AgQCBIIBbwSCAWsBaQB2AK33vvp8/xDIi509nB4+GGq0Zyld
-z7EMJMqFhjTr3IKKAAABg0Gm2TYAAAQDAEcwRQIhALiniSGuqkWYzpK2PZcJOpdJ
-h84Owcvf89jgOsejSmLFAiBgmyHMPpmFZoTcC9nQYj1Ve91vzUJwROhVYgB2QI5U
-0gB2AHoyjFTYty22IOo44FIe6YQWcDIThU070ivBOlejUutSAAABg0Gm2QwAAAQD
-AEcwRQIhALl18e7k0rrPMCgm/IwuyhH+W2Rg4uw0NZx8pY6ARhW0AiAIQ72cAtwO
-+sKcpLxrswKqiD6PnUydEoAWUwxbJXy/SQB3AOg+0No+9QY1MudXKLyJa8kD08vR
-EWvs62nhd31tBr1uAAABg0Gm2NEAAAQDAEgwRgIhAO9RQAv7uKvM9GlH+sRNjyQO
-XEAgD0dUxC9TvQTf7lHdAiEAiR/qkBZ5A0+0KL3CtyfpHiKVsrZ6ytFbmlwUT/aO
-+i4wCgYIKoZIzj0EAwIDSQAwRgIhAI9REHJ+T2C0YGqeMGdzRZva2r10TblwEIY7
-/xi1DU44AiEArcP0YyT4gL0QZ+xZ4HKHkiHPiLZRUjc76Dj18uZQztA=
+MIIE0zCCBHmgAwIBAgIRALM7+TqG3vA1b3VeaZeH+kQwCgYIKoZIzj0EAwIwgY8x
+CzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNV
+BAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE3MDUGA1UEAxMu
+U2VjdGlnbyBFQ0MgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQTAe
+Fw0yMzEwMDIwMDAwMDBaFw0yNDA5MTUyMzU5NTlaMB4xHDAaBgNVBAMMEyoudGhp
+bmdzYm9hcmQuY2xvdWQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZCv1Hq0GVzz9B
+/05fGIUT5c1vOckwHEOYV4bNn8l5+wXY+BLnkLma7z8PfMcBya/O47JRW0v1oknb
+QWD747FMl6oe2jLznBIUoBDlg5raI9z9V5NYTS2+psQEHxS/HGejggMHMIIDAzAf
+BgNVHSMEGDAWgBT2hQo7EYbhBH0Oqgss0u7MZHt7rjAdBgNVHQ4EFgQUa+Bxtt3b
+GqOvK/a+6GxsQe9KbQcwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEkGA1UdIARCMEAwNAYLKwYBBAGy
+MQECAgcwJTAjBggrBgEFBQcCARYXaHR0cHM6Ly9zZWN0aWdvLmNvbS9DUFMwCAYG
+Z4EMAQIBMIGEBggrBgEFBQcBAQR4MHYwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9jcnQu
+c2VjdGlnby5jb20vU2VjdGlnb0VDQ0RvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2
+ZXJDQS5jcnQwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLnNlY3RpZ28uY29tMDEG
+A1UdEQQqMCiCEyoudGhpbmdzYm9hcmQuY2xvdWSCEXRoaW5nc2JvYXJkLmNsb3Vk
+MIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdQB2/4g/Crb7lVHCYcz1h7o0tKTN
+uyncaEIKn+ZnTFo6dAAAAYrvzxAwAAAEAwBGMEQCIEW2dO3bRKZROUfFRj24dnkV
+YKi4Z8hCRpgpS32JNaPZAiBG8XBvMyX5trxxycPZkViS6GPX6y0o8W+OP2xOMp5O
+xQB2ANq2v2s/tbYin5vCu1xr6HCRcWy7UYSFNL2kPTBI1/urAAABiu/PEIgAAAQD
+AEcwRQIhALK2X+bknNGN5pb8TVIkiAylShsz3+7Z1kSaCRNJdWnQAiBY1a5vhRC7
+AWi9oHYGzMnkYnALbC6an4Y9pVNLvyWTJwB2AO7N0GTV2xrOxVy3nbTNE6Iyh0Z8
+vOzew1FIWUZxH7WbAAABiu/PEFIAAAQDAEcwRQIhAMP/Q1PIZIMDyYZAeR5Qkx6L
+fE/V2fvGDKnGkU06M1djAiAgvbhSPX/CJUrvPwL5n2wfEP07+Q0e4tDB1h0IsF4/
+ETAKBggqhkjOPQQDAgNIADBFAiEAxuey2oP00B6/fXiE7Ka7tEAG3WzlfZgP6Pmt
+07W22wkCIHHyEa8QTZMigr4IYqMFfQsZG3QCVMvrtU+H19XTyG0Q
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIDqDCCAy6gAwIBAgIRAPNkTmtuAFAjfglGvXvh9R0wCgYIKoZIzj0EAwMwgYgx

diff --git a/docs/paas/user-guide/resources/mqtt-over-ssl/tb-cloud-root-ca.pem b/docs/paas/user-guide/resources/mqtt-over-ssl/tb-cloud-root-ca.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
diff --git a/docs/pe/user-guide/resources/mqtt-over-ssl/one-way-ssl-mqtt-client.py b/docs/pe/user-guide/resources/mqtt-over-ssl/one-way-ssl-mqtt-client.py
@@ -31,7 +31,7 @@ def collect_required_data():
             "Please write path to your server public certificate or leave it blank to use default (mqttserver.pub.pem): ")
         config["ca_cert"] = ca_cert if ca_cert else "mqttserver.pub.pem"
     else:
-        config["ca_cert"] = "tb-cloud-chain.pem"
+        config["ca_cert"] = "tb-cloud-root-ca.pem"
     token = ""
     while not token:
         token = input("Please write accessToken for device: ")

diff --git a/docs/user-guide/resources/mqtt-over-ssl/one-way-ssl-mqtt-client.py b/docs/user-guide/resources/mqtt-over-ssl/one-way-ssl-mqtt-client.py
@@ -31,7 +31,7 @@ def collect_required_data():
             "Please write path to your server public certificate or leave it blank to use default (mqttserver.pub.pem): ")
         config["ca_cert"] = ca_cert if ca_cert else "mqttserver.pub.pem"
     else:
-        config["ca_cert"] = "tb-cloud-chain.pem"
+        config["ca_cert"] = "tb-cloud-root-ca.pem"
     token = ""
     while not token:
         token = input("Please write accessToken for device: ")