From d329a1d4e3eed0e5b42bb26734f564f150dd9d86 Mon Sep 17 00:00:00 2001 From: ridomin Date: Fri, 16 Sep 2022 09:46:48 -0700 Subject: [PATCH] review settings template --- samples/README.md | 7 +++++- .../Properties/launchSettings.json.template | 22 ++++++++--------- .../Properties/launchSettings.json.template | 22 ++++++++--------- .../Properties/launchSettings.json.template | 22 ++++++++--------- samples/pi-sense-device/mosquitto.org.crt | 24 +++++++++++++++++++ 5 files changed, 63 insertions(+), 34 deletions(-) create mode 100644 samples/pi-sense-device/mosquitto.org.crt diff --git a/samples/README.md b/samples/README.md index d252474..7e3a386 100644 --- a/samples/README.md +++ b/samples/README.md @@ -2,7 +2,12 @@ This folder contains sample projects with devices that can be connected to multiple MQTT endpoints ->Note: All samples must be run with the `ConnectionStrings__cs` envvar, or as CLI argument `/ConnectionStrings:cs` . There are sample connection strings in the launchSettings.json.template to use as `dotnet run --launch-profile` +All samples must be run with the `ConnectionStrings__cs` envvar, or as CLI argument `/ConnectionStrings:cs` . + +There are sample connection strings in the `launchSettings.json.template` to use as `dotnet run --launch-profile`: + +- Rename the file to `launchSettings.json` +- Set device credentials (this file is .gitignored) ## memmon diff --git a/samples/memmon/Properties/launchSettings.json.template b/samples/memmon/Properties/launchSettings.json.template index 1100ee6..b4daca4 100644 --- a/samples/memmon/Properties/launchSettings.json.template +++ b/samples/memmon/Properties/launchSettings.json.template @@ -1,9 +1,15 @@ { "profiles": { - "mosquitto-localhost": { + "localhost": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=localhost;TcpPort=1883;DeviceId=memmon01;UserName=user;Password=password" + "ConnectionStrings__cs": "HostName=localhost;TcpPort=1883;UseTls=false;DeviceId=mqtt-device;UserName=user;Password=password" + } + }, + "localhost_tls": { + "commandName": "Project", + "environmentVariables": { + "ConnectionStrings__cs": "HostName=localhost;DeviceId=mqtt-device;UserName=user;Password=password;CaFile=localhost.pem" } }, "iothub": { @@ -25,22 +31,16 @@ "masterKey": "" } }, - "aws": { - "commandName": "Project", - "environmentVariables": { - "ConnectionStrings__cs": "HostName=.amazonaws.com;X509Key=cert.pem|cert.key" - } - }, "hub-x509": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=.azure-devices.net;X509Key=cert.pem|cert.key" + "ConnectionStrings__cs": "HostName=.azure-devices.net;X509Key=|" } }, - "broker-x509": { + "mosquitto_tls": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=testmosquitto.org;tcpport=8884;X509Key=ca-device.pem|ca-device.key;cafile=mosquitto.org.crt" + "ConnectionStrings__cs": "HostName=test.mosquitto.org;ClientId=mqtt-device;CaFile=test.mosquitto.org.crt" } } } diff --git a/samples/mqtt-device/Properties/launchSettings.json.template b/samples/mqtt-device/Properties/launchSettings.json.template index d230962..ef23014 100644 --- a/samples/mqtt-device/Properties/launchSettings.json.template +++ b/samples/mqtt-device/Properties/launchSettings.json.template @@ -1,9 +1,15 @@ { "profiles": { - "mosquitto-localhost": { + "localhost": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=localhost;TcpPort=1883;UseTls=false;DeviceId=sampledevice;UserName=user;Password=password;CaFile=localhost.ca.pem" + "ConnectionStrings__cs": "HostName=localhost;TcpPort=1883;UseTls=false;DeviceId=mqtt-device;UserName=user;Password=password" + } + }, + "localhost_tls": { + "commandName": "Project", + "environmentVariables": { + "ConnectionStrings__cs": "HostName=localhost;DeviceId=mqtt-device;UserName=user;Password=password;CaFile=localhost.pem" } }, "iothub": { @@ -25,22 +31,16 @@ "masterKey": "" } }, - "aws": { - "commandName": "Project", - "environmentVariables": { - "ConnectionStrings__cs": "HostName=.amazonaws.com;X509Key=cert.pem|cert.key" - } - }, "hub-x509": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=.azure-devices.net;X509Key=cert.pem|cert.key" + "ConnectionStrings__cs": "HostName=.azure-devices.net;X509Key=|" } }, - "broker-x509": { + "mosquitto_tls": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=testmosquitto.org;tcpport=8884;X509Key=ca-device.pem|ca-device.key;cafile=mosquitto.org.crt" + "ConnectionStrings__cs": "HostName=test.mosquitto.org;ClientId=mqtt-device;CaFile=test.mosquitto.org.crt" } } } diff --git a/samples/pi-sense-device/Properties/launchSettings.json.template b/samples/pi-sense-device/Properties/launchSettings.json.template index 1100ee6..b4daca4 100644 --- a/samples/pi-sense-device/Properties/launchSettings.json.template +++ b/samples/pi-sense-device/Properties/launchSettings.json.template @@ -1,9 +1,15 @@ { "profiles": { - "mosquitto-localhost": { + "localhost": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=localhost;TcpPort=1883;DeviceId=memmon01;UserName=user;Password=password" + "ConnectionStrings__cs": "HostName=localhost;TcpPort=1883;UseTls=false;DeviceId=mqtt-device;UserName=user;Password=password" + } + }, + "localhost_tls": { + "commandName": "Project", + "environmentVariables": { + "ConnectionStrings__cs": "HostName=localhost;DeviceId=mqtt-device;UserName=user;Password=password;CaFile=localhost.pem" } }, "iothub": { @@ -25,22 +31,16 @@ "masterKey": "" } }, - "aws": { - "commandName": "Project", - "environmentVariables": { - "ConnectionStrings__cs": "HostName=.amazonaws.com;X509Key=cert.pem|cert.key" - } - }, "hub-x509": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=.azure-devices.net;X509Key=cert.pem|cert.key" + "ConnectionStrings__cs": "HostName=.azure-devices.net;X509Key=|" } }, - "broker-x509": { + "mosquitto_tls": { "commandName": "Project", "environmentVariables": { - "ConnectionStrings__cs": "HostName=testmosquitto.org;tcpport=8884;X509Key=ca-device.pem|ca-device.key;cafile=mosquitto.org.crt" + "ConnectionStrings__cs": "HostName=test.mosquitto.org;ClientId=mqtt-device;CaFile=test.mosquitto.org.crt" } } } diff --git a/samples/pi-sense-device/mosquitto.org.crt b/samples/pi-sense-device/mosquitto.org.crt new file mode 100644 index 0000000..1294a2f --- /dev/null +++ b/samples/pi-sense-device/mosquitto.org.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEAzCCAuugAwIBAgIUBY1hlCGvdj4NhBXkZ/uLUZNILAwwDQYJKoZIhvcNAQEL +BQAwgZAxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Vbml0ZWQgS2luZ2RvbTEOMAwG +A1UEBwwFRGVyYnkxEjAQBgNVBAoMCU1vc3F1aXR0bzELMAkGA1UECwwCQ0ExFjAU +BgNVBAMMDW1vc3F1aXR0by5vcmcxHzAdBgkqhkiG9w0BCQEWEHJvZ2VyQGF0Y2hv +by5vcmcwHhcNMjAwNjA5MTEwNjM5WhcNMzAwNjA3MTEwNjM5WjCBkDELMAkGA1UE +BhMCR0IxFzAVBgNVBAgMDlVuaXRlZCBLaW5nZG9tMQ4wDAYDVQQHDAVEZXJieTES +MBAGA1UECgwJTW9zcXVpdHRvMQswCQYDVQQLDAJDQTEWMBQGA1UEAwwNbW9zcXVp +dHRvLm9yZzEfMB0GCSqGSIb3DQEJARYQcm9nZXJAYXRjaG9vLm9yZzCCASIwDQYJ +KoZIhvcNAQEBBQADggEPADCCAQoCggEBAME0HKmIzfTOwkKLT3THHe+ObdizamPg +UZmD64Tf3zJdNeYGYn4CEXbyP6fy3tWc8S2boW6dzrH8SdFf9uo320GJA9B7U1FW +Te3xda/Lm3JFfaHjkWw7jBwcauQZjpGINHapHRlpiCZsquAthOgxW9SgDgYlGzEA +s06pkEFiMw+qDfLo/sxFKB6vQlFekMeCymjLCbNwPJyqyhFmPWwio/PDMruBTzPH +3cioBnrJWKXc3OjXdLGFJOfj7pP0j/dr2LH72eSvv3PQQFl90CZPFhrCUcRHSSxo +E6yjGOdnz7f6PveLIB574kQORwt8ePn0yidrTC1ictikED3nHYhMUOUCAwEAAaNT +MFEwHQYDVR0OBBYEFPVV6xBUFPiGKDyo5V3+Hbh4N9YSMB8GA1UdIwQYMBaAFPVV +6xBUFPiGKDyo5V3+Hbh4N9YSMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL +BQADggEBAGa9kS21N70ThM6/Hj9D7mbVxKLBjVWe2TPsGfbl3rEDfZ+OKRZ2j6AC +6r7jb4TZO3dzF2p6dgbrlU71Y/4K0TdzIjRj3cQ3KSm41JvUQ0hZ/c04iGDg/xWf ++pp58nfPAYwuerruPNWmlStWAXf0UTqRtg4hQDWBuUFDJTuWuuBvEXudz74eh/wK +sMwfu1HFvjy5Z0iMDU8PUDepjVolOCue9ashlS4EB5IECdSR2TItnAIiIwimx839 +LdUdRudafMu5T5Xma182OC0/u/xRlEm+tvKGGmfFcN0piqVl8OrSPBgIlb+1IKJE +m/XriWr/Cq4h/JfB7NTsezVslgkBaoU= +-----END CERTIFICATE----- \ No newline at end of file