NOISSUE- Fix renaming of mainflux-server to magistrala-server (#15)

* fix renaming of mainflux-server

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

* generate certs

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>

---------

Signed-off-by: ianmuchyri <ianmuchiri8@gmail.com>
This commit is contained in:
Ian Ngethe Muchiri
2023-11-01 15:03:17 +03:00
committed by GitHub
parent 5a565a110a
commit 0907074922
10 changed files with 149 additions and 148 deletions
+2 -2
View File
@@ -132,8 +132,8 @@ vaultCleanupFiles
echo "Copying certificate files"
cp -v data/${MG_VAULT_CA_CN}.crt ${MAINFLUX_DIR}/docker/ssl/certs/mainflux-server.crt
cp -v data/${MG_VAULT_CA_CN}.key ${MAINFLUX_DIR}/docker/ssl/certs/mainflux-server.key
cp -v data/${MG_VAULT_CA_CN}.crt ${MAINFLUX_DIR}/docker/ssl/certs/magistrala-server.crt
cp -v data/${MG_VAULT_CA_CN}.key ${MAINFLUX_DIR}/docker/ssl/certs/magistrala-server.key
cp -v data/${MG_VAULT_CA_NAME}_int.key ${MAINFLUX_DIR}/docker/ssl/certs/ca.key
cp -v data/${MG_VAULT_CA_NAME}_int.crt ${MAINFLUX_DIR}/docker/ssl/certs/ca.crt
cp -v data/${MG_VAULT_CA_NAME}_int_bundle.crt ${MAINFLUX_DIR}/docker/ssl/bundle.pem
+2 -2
View File
@@ -3,8 +3,8 @@
# These paths are set to its default values as
# a volume in the docker/docker-compose.yml file.
ssl_certificate /etc/ssl/certs/mainflux-server.crt;
ssl_certificate_key /etc/ssl/private/mainflux-server.key;
ssl_certificate /etc/ssl/certs/magistrala-server.crt;
ssl_certificate_key /etc/ssl/private/magistrala-server.key;
ssl_dhparam /etc/ssl/certs/dhparam.pem;
ssl_protocols TLSv1.2 TLSv1.3;
+12 -12
View File
@@ -1,8 +1,8 @@
CRT_LOCATION = certs
O = Magistrala
OU_CA = mainflux_ca
OU_CRT = mainflux_crt
EA = info@mainflux.com
OU_CA = magistrala_ca
OU_CRT = magistrala_crt
EA = info@magistrala.com
CN_CA = Magistrala_Self_Signed_CA
CN_SRV = localhost
THING_SECRET = <THING_SECRET> # e.g. 8f65ed04-0770-4ce4-a291-6d1bf2000f4d
@@ -31,8 +31,8 @@ CN = mf.svc
C = RS
ST = RS
L = BELGRADE
O = MAINFLUX
OU = MAINFLUX
O = MAGISTRALA
OU = MAGISTRALA
[v3_req]
subjectAltName = @alt_names
@@ -55,20 +55,20 @@ ca:
openssl req -newkey rsa:2048 -x509 -nodes -sha512 -days 1095 \
-keyout $(CRT_LOCATION)/ca.key -out $(CRT_LOCATION)/ca.crt -subj "/CN=$(CN_CA)/O=$(O)/OU=$(OU_CA)/emailAddress=$(EA)"
# Server cert and key name is "mainflux-server".
# Server cert and key name is "magistrala-server".
server_cert:
# Create mainflux server key and CSR.
openssl req -new -sha256 -newkey rsa:4096 -nodes -keyout $(CRT_LOCATION)/mainflux-server.key \
-out $(CRT_LOCATION)/mainflux-server.csr -subj "/CN=$(CN_SRV)/O=$(O)/OU=$(OU_CRT)/emailAddress=$(EA)"
# Create magistrala server key and CSR.
openssl req -new -sha256 -newkey rsa:4096 -nodes -keyout $(CRT_LOCATION)/magistrala-server.key \
-out $(CRT_LOCATION)/magistrala-server.csr -subj "/CN=$(CN_SRV)/O=$(O)/OU=$(OU_CRT)/emailAddress=$(EA)"
# Sign server CSR.
openssl x509 -req -days 1000 -in $(CRT_LOCATION)/mainflux-server.csr -CA $(CRT_LOCATION)/ca.crt -CAkey $(CRT_LOCATION)/ca.key -CAcreateserial -out $(CRT_LOCATION)/mainflux-server.crt
openssl x509 -req -days 1000 -in $(CRT_LOCATION)/magistrala-server.csr -CA $(CRT_LOCATION)/ca.crt -CAkey $(CRT_LOCATION)/ca.key -CAcreateserial -out $(CRT_LOCATION)/magistrala-server.crt
# Remove CSR.
rm $(CRT_LOCATION)/mainflux-server.csr
rm $(CRT_LOCATION)/magistrala-server.csr
thing_cert:
# Create mainflux server key and CSR.
# Create magistrala server key and CSR.
openssl req -new -sha256 -newkey rsa:4096 -nodes -keyout $(CRT_LOCATION)/$(CRT_FILE_NAME).key \
-out $(CRT_LOCATION)/$(CRT_FILE_NAME).csr -subj "/CN=$(THING_SECRET)/O=$(O)/OU=$(OU_CRT)/emailAddress=$(EA)"
+21 -20
View File
@@ -1,22 +1,23 @@
-----BEGIN CERTIFICATE-----
MIIDuzCCAqOgAwIBAgIUF93//gxz1PfPgtbaOY3Fj/H4URYwDQYJKoZIhvcNAQEN
BQAwbTEgMB4GA1UEAwwXTWFpbmZsdXhfU2VsZl9TaWduZWRfQ0ExETAPBgNVBAoM
CE1haW5mbHV4MRQwEgYDVQQLDAttYWluZmx1eF9jYTEgMB4GCSqGSIb3DQEJARYR
aW5mb0BtYWluZmx1eC5jb20wHhcNMjMwMTI0MTQ0NjMxWhcNMjYwMTIzMTQ0NjMx
WjBtMSAwHgYDVQQDDBdNYWluZmx1eF9TZWxmX1NpZ25lZF9DQTERMA8GA1UECgwI
TWFpbmZsdXgxFDASBgNVBAsMC21haW5mbHV4X2NhMSAwHgYJKoZIhvcNAQkBFhFp
bmZvQG1haW5mbHV4LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
APhtdyNf5Eh/kuKxDnauoHe/PmX9cehq53i5zewnR2jMsFS1jkksLmoFthTvcAIA
uOtwcPaUpWq3oNLpqC4JkMCgBF+Qgu/N2AL8fx5QJQSjo8bF9pe2JgDI3AhpcoJi
RxJNPOr32GysTaOW43Wup0hUJcRor3ht9Bu2HpGTNmVUdTw16O+6k6/S1fu0K/RM
OF/NXEK6be7zHS/ET3SMLWWKFFf3VyBYcf5SuLhVFbjhJC/H1f8eQQeY+ctcAJEv
hAG1BkujMkSP0mlSVx8mg6duKTO2+F7qBXgjJTBwMfqjwxBFv0Ag/SGyWLBHH3h9
dArz0p4xknjtZAcXH7Ld5r0CAwEAAaNTMFEwHQYDVR0OBBYEFGermV/h4kUH/EMX
brQOWE1sgYdlMB8GA1UdIwQYMBaAFGermV/h4kUH/EMXbrQOWE1sgYdlMA8GA1Ud
EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQENBQADggEBABuOu3wxjWvTVHlxuZxVxRTB
IakGP0v8W6KRRb0aVMDwa49Kk1o1Pi0vAcgMPXSJosjb1oQr4UTjwc6yRGtEt9QU
KSPlsDmLr4GkK3Cm2dprpBFFnN1C7IkNOMYdZN+kbz+7eyYKYgNI8X97p6bmc4xZ
2IPxNU0ZEojn4oQCfwf9iPxGn4Hdpu3ZlhN54VCp0EosuyMB3GjR3KzQO1fM6Eeo
+xCkKhjuzEV+HetsWLYAmcVfOt7soTBNALbTgdEcA6LutO2JvGidQKyc9I/9m+Ox
i+G5y4vRVmMff94AethLVI9XtXCYjhxsEEm2hI9laq9dbv5/+9RgSHibVkX9aL4=
MIIDyzCCArOgAwIBAgIUDIJg63dQVzoD9nmWi9YPscQwTgIwDQYJKoZIhvcNAQEN
BQAwdTEiMCAGA1UEAwwZTWFnaXN0cmFsYV9TZWxmX1NpZ25lZF9DQTETMBEGA1UE
CgwKTWFnaXN0cmFsYTEWMBQGA1UECwwNbWFnaXN0cmFsYV9jYTEiMCAGCSqGSIb3
DQEJARYTaW5mb0BtYWdpc3RyYWxhLmNvbTAeFw0yMzEwMzAwODE5MDFaFw0yNjEw
MjkwODE5MDFaMHUxIjAgBgNVBAMMGU1hZ2lzdHJhbGFfU2VsZl9TaWduZWRfQ0Ex
EzARBgNVBAoMCk1hZ2lzdHJhbGExFjAUBgNVBAsMDW1hZ2lzdHJhbGFfY2ExIjAg
BgkqhkiG9w0BCQEWE2luZm9AbWFnaXN0cmFsYS5jb20wggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQCWNIeGfo/SePOvviJE6UHJhBzWcPfNVbzSF6A42WgB
DEgI3KFr+/rgWMEaCOD4QzCl3Lqa89EgCA7xCgxcqFwEo33SyhAivwoHL2pRVHXn
oee3z9U757T63YLE0qrXQY2cbyChX/OU99rZxyd5l5jUGN7MCu+RYurfTIiYN+Uv
NZdl8a3X84g7fa70EOYas7cTunWUt9x64/jYDoYmn+XPXET1yEU1dQTnKY4cRjhv
HS1u2QsadHKi1hgeILyLbB4u1T5N+WfxFknhFHTu8PVPxfowrVv/xzmxOe0zSZFd
SbhtrmwT4S1wJ4PfUa3+tYZVtjEKKbyObsAW91WzOLS9AgMBAAGjUzBRMB0GA1Ud
DgQWBBQkE4koZctEZpTz9pq6a6s6xg+myTAfBgNVHSMEGDAWgBQkE4koZctEZpTz
9pq6a6s6xg+myTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDQUAA4IBAQA7
w/oh5U9loJsigf3X3T3jQM8PVmhsUfNMJ3kc1Yumr72S4sGKjdWwuU0vk+B3eQzh
zXAj65BHhs1pXcukeoLR7YcHABEsEMg6lar/E4A+MgAZfZFVSvPpsByIK8I5ARk+
K1V/lWso+GJJM/lImPPnpvUWBdbntqC5WtjoMMGL9uyV3kVS6yT/kJ2ercnPzhPh
uBkL1ZH3ivDn/0JDY+T8Sfeq08vNWaTcoC7qpPwqXhuT0ytY7oaBS5wmPcvvzpZg
6zZYPZfhjhdEFYY1hDrrPYNYO72jncUnwQVp3X0DQpSvbxp681hVkcEtwHB2B8l0
tBGhgoH+TqZs0AUjoXM0
-----END CERTIFICATE-----
+26 -26
View File
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD4bXcjX+RIf5Li
sQ52rqB3vz5l/XHoaud4uc3sJ0dozLBUtY5JLC5qBbYU73ACALjrcHD2lKVqt6DS
6aguCZDAoARfkILvzdgC/H8eUCUEo6PGxfaXtiYAyNwIaXKCYkcSTTzq99hsrE2j
luN1rqdIVCXEaK94bfQbth6RkzZlVHU8NejvupOv0tX7tCv0TDhfzVxCum3u8x0v
xE90jC1lihRX91cgWHH+Uri4VRW44SQvx9X/HkEHmPnLXACRL4QBtQZLozJEj9Jp
UlcfJoOnbikztvhe6gV4IyUwcDH6o8MQRb9AIP0hsliwRx94fXQK89KeMZJ47WQH
Fx+y3ea9AgMBAAECggEAHi+U5KI795gyxaNMddzRqEM/Zn6lht9oiVmQXTPHoEMQ
4PYfmCILcLwJbCFM651hWtBSlY+pyt4Np1sXYaKtaU54QZFqa4+IQhKispD78oSc
u6QlyrjqBLnjTI1didy9tIpYjtd3P3svQuOsd0n1zxrUbPloatp3aR+Xtsobt7OO
cvp01Sg/tik9t4N2Jo6TEjdnZM+f17w2Dkesl1vfWqNSat+U0yMipIRTgPh/o+gW
Cr5XtBbTkdjV7ivl6iMsS/5pFCAl9WysarFECoaFRaUhS/4t8fH5roSz1CXNTaib
DPA7U5UM+Bott/yud89I0wIEcCcNL24bdrhwuSTuWQKBgQD82S4dVX3AcM9kuaty
0bdvgKgA7P1Gy4eI2igC6lqD/Qbz0vHJvlts+7rHE7muYLRnMIWaDdhFRDuiWwa3
mp358H+BsXHpAdjKlCp1/5KnFKZfB18LU5ZdSyEbs92l9q3JKJqneAN2wof71pTg
i1jFLNDnK6D1nxZzjfcSX43CZQKBgQD7hi3O2INYZ5wE640T86Fbup5yDGKk6aIP
ddbYE2S2pQx1ywgFcoN33m+5/F7A5yLg7Xf8nR4p110PM+apflNJlvX5y6cISa3A
yFS989SlTFLrMWZB/Y/lyXuDEN+fYK+KvKM7eLsH4byPXXkKW20C0/ua1vyNwhjg
rZfiY7YheQKBgEKVRml/G9BTZKnXouhnhXCdZqBnyAKekiBdom+yGwfq16vZfsZr
lFPMrlDCRwE+ggMyadw5jRwgbbvBULGEy9kHlewnOCHt1JL0FYJhPNM2wuD/Ze3r
owsKP7u1z8ZmgTkZsjArkG3zqC+PQEEpMMUrmg9mE8rai+T+G3QBKalpAoGAO6Aj
W9WXzW1CXyg32XL33Xbv+LlW6SE5edDFjZOLXIDj40iuLhxnbhMdCUn6bGBetFOX
Dhtw+xpCxUfYdnWr6NYQmZbdkelldz4GWMFkt4rQXVDonNwvMJoC3Z8yY+XXt1vg
lkiYjdXFjXbrKrlhrjnye1JbrH9GxnxgdRqOIoECgYBiJ+8Wx6qHHmaHWDlpqOdE
uGiVnL0j+YJCQjxzeFeCQf+YfQ1dAXzzCAfHDtvG8G1UpMKJZGrbCueLfGH1nrO/
Z12j/jFEd7aP6z36BlHTLXdLMZBLCwDfKkLm76X9XaV+bSu3yvI0ij0B9ZcN3vxK
eapGGxRUvEQnTotlPj/e0g==
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCWNIeGfo/SePOv
viJE6UHJhBzWcPfNVbzSF6A42WgBDEgI3KFr+/rgWMEaCOD4QzCl3Lqa89EgCA7x
CgxcqFwEo33SyhAivwoHL2pRVHXnoee3z9U757T63YLE0qrXQY2cbyChX/OU99rZ
xyd5l5jUGN7MCu+RYurfTIiYN+UvNZdl8a3X84g7fa70EOYas7cTunWUt9x64/jY
DoYmn+XPXET1yEU1dQTnKY4cRjhvHS1u2QsadHKi1hgeILyLbB4u1T5N+WfxFknh
FHTu8PVPxfowrVv/xzmxOe0zSZFdSbhtrmwT4S1wJ4PfUa3+tYZVtjEKKbyObsAW
91WzOLS9AgMBAAECggEAEOxEq6jFO/WgIPgHROPR42ok1J1AMgx7nGEIjnciImIX
mJYBAtlOM+oUAYKoFBh/2eQTSyN2t4jo5AvZhjP6wBQKeE4HQN7supADRrwBF7KU
WI+MKvZpW81KrzG8CUoLsikMEFpu52UAbYJkZmznzVeq/GqsAKGYLEXjauD7S5Tu
GeGVKO4novus6t3AHnBvfalIQ1JUuJFvcd5ZDhPljlzPbbWdM4WpRPaFZIKmfXft
G7Izt58yPCYwhxohjrunRudyX3oKvmCBUOBXC8HdHzND/dLxwlrVu7OjmXprmC6P
8ggNpjAPeO8Y6+EKGne1fETNsKgODY/lXGOwECY4eQKBgQDSGi3WuoT/+DecVeSF
GfmavdGCQKOD0kdl7qCeQYAL+SPVz4157AtxZs3idapvlbrc7wvw4Ev1XT7ZmWUj
Lc4/UAITR8EkkFRVbxt2PvV86AiQtmXFguTNEX5vTszRwZ2+eqijZga5niBkqyAi
SRuTwR8WrDZau4mRNnF8bUl8dQKBgQC3BKYifRp4hHqBycHe9rSMZ8Xz+ZOy+IFA
vYap1Az+e8KuqlmD9Kfpp2Mjba1+HL5WKeTJGpFE7bhvb/xMPJgbMgtQ/cw4uDJ/
fwv4m6arf76ebOhaZtkT1vD4NyiyB+z6xP0TRgQRr2Or98XBSvGAYDXIn5vL7fUg
KrDF0ePuKQKBgDfaOcFRiDW7uJzYwI0ZoJ8gQufLYyyR4+UXEJ/BbdbA/mPCbyuw
MkKNP8Ip4YsUVL6S1avNFKQ/i4uxGY/Gh4ORM1wIwTGFJMYpaTV/+yafUFeYBWoC
J+zT77aLTiucuuB+HwKBBtylSps4WqyCntAikK8oTLLGFAYEYRrgup5ZAoGAbQ8j
JNghxwFCs0aT9ZZTfnt0NW9auUJmWzrVHSxUVe1P1J+EWiKXUJ/DbuAzizv7nAK4
57GiMU3rItS7pn5RMZt/rNKgOIhi5yDA9HNkPTwRTfyd9QjmgHEMBQ1xfa1FZSWv
nSWS1SsLnPU37XgIMzShuByMTVhOQs3NqwPo7AkCgYAf8AzQNjFCoTwU3SJezJ4H
9j1jvMO232hAl8UDNtqvJ1APn87tOtnfX48OMoRrP9kKI0oygE3pq7rFxu1qmTns
Zir0+KLeWGg58fSZkUEAp6kbO5CKwoeVAY9EMgd7BYBqlXLqUNfdH0L+KUOFKHha
7e82VxpgBeskzAqN1e7YRA==
-----END PRIVATE KEY-----
+26
View File
@@ -0,0 +1,26 @@
-----BEGIN CERTIFICATE-----
MIIEYjCCA0oCFGXr7rfGAynaa4KMTG1+23EEF0lYMA0GCSqGSIb3DQEBCwUAMHUx
IjAgBgNVBAMMGU1hZ2lzdHJhbGFfU2VsZl9TaWduZWRfQ0ExEzARBgNVBAoMCk1h
Z2lzdHJhbGExFjAUBgNVBAsMDW1hZ2lzdHJhbGFfY2ExIjAgBgkqhkiG9w0BCQEW
E2luZm9AbWFnaXN0cmFsYS5jb20wHhcNMjMxMDMwMDgxOTA4WhcNMjYwNzI2MDgx
OTA4WjBmMRIwEAYDVQQDDAlsb2NhbGhvc3QxEzARBgNVBAoMCk1hZ2lzdHJhbGEx
FzAVBgNVBAsMDm1hZ2lzdHJhbGFfY3J0MSIwIAYJKoZIhvcNAQkBFhNpbmZvQG1h
Z2lzdHJhbGEuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAojas
t6M294uS5q8oFmYM6DULVQ1lY3K659VusJshjGvn8bi50vhKo8PpxL6ygVpjWcHG
+/gclQnTaYZumC1TUohibpBnrFx1PZUvGiryAPudFY2nC5af5BQnYGi845FcVWx5
FNLq+IsedgSZf7FuGcZruXiukBCWVyWJRJh+8FDakc65BPeG9FpCxbeLZ1nrDpnQ
bhHbwEQrwwHk0FHZ/3cuVFJAjwqJSivJ9598eU0YWAsqsLM3uYyvOMd8alMs5vCZ
9tMCpO2v6xTdJ6kr68SwQQAiefRy6gsD5J5A4ySyCz7KX9fHCrqx1kdcDJ/CXZmh
mXxrCFKSjqjuSn2qtm+gxvAc26Zbt5z5eihpdISDUKrjW11+yapNZLATGBX8ktek
gW467V9DQYOsbA3fNkWgd5UcV5HIViUpqFMFvi1NpWc2INi/PTDWuAIBLUiVNk0W
qMtG7/HqFRPn6MrNGpvFpglgxXGNfjsggkK/3INtFnAou2rN9+ieeuzO7Zjrtwsq
sP64GVw/vLv3tgT6TIZmDnCDCqtEGEVutt7ldu3M0/fLm4qOUsZqFGrIOO1cfI4x
7FRnHwaTsTB1Og+I7lEujb4efHV+uRjKyrGh6L6hDt94IkGm6ZEj5z/iEmq16jRX
dUbYsu4f1KlfTYdHWGHp+6kAmDn0jGCwz2BBrnsCAwEAATANBgkqhkiG9w0BAQsF
AAOCAQEAKyg5kvDk+TQ6ZDCK7qxKY+uN9setYvvsLfde+Uy51a3zj8RIHRgkOT2C
LuuTtTYKu3XmfCKId0oTXynGuP+yDAIuVwuZz3S0VmA8ijoZ87LJXzsLjjTjQSzZ
ar6RmlRDH+8Bm4AOrT4TDupqifag4J0msHkNPo0jVK6fnuniqJoSlhIbbHrJTHhv
jKNXrThjr/irgg1MZ7slojieOS0QoZHRE9eunIR5enDJwB5pWUJSmZWlisI7+Ibi
06+j8wZegU0nqeWp4wFSZxKnrzz5B5Qu9SrALwlHWirzBpyr0gAcF2v7nzbWviZ/
0VMyY4FGEbkp6trMxwJs5hGYhAiyXg==
-----END CERTIFICATE-----
+52
View File
@@ -0,0 +1,52 @@
-----BEGIN PRIVATE KEY-----
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
+C7JCqJGg66liqIMq6YyYXK//Ddl
-----END PRIVATE KEY-----
-26
View File
@@ -1,26 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIEVDCCAzwCFGnFgvTPAC1aWF96DB+5fRvBtWuuMA0GCSqGSIb3DQEBCwUAMG0x
IDAeBgNVBAMMF01haW5mbHV4X1NlbGZfU2lnbmVkX0NBMREwDwYDVQQKDAhNYWlu
Zmx1eDEUMBIGA1UECwwLbWFpbmZsdXhfY2ExIDAeBgkqhkiG9w0BCQEWEWluZm9A
bWFpbmZsdXguY29tMB4XDTIzMDEyNDE0NDY0MloXDTI1MTAyMDE0NDY0MlowYDES
MBAGA1UEAwwJbG9jYWxob3N0MREwDwYDVQQKDAhNYWluZmx1eDEVMBMGA1UECwwM
bWFpbmZsdXhfY3J0MSAwHgYJKoZIhvcNAQkBFhFpbmZvQG1haW5mbHV4LmNvbTCC
AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKdQEwV+SYXuTkgq/LwUN8O6
5+rmp/gL/MPYAuqcf4SP38jJHCTQT/DRh+gLhu5w0wz7RGBl3TU793HjsJQiV+/z
H8AYDHvfCCZisc9RNuOHFWG4a1RT+urnriIK2yRd1Ht5j/JWtakJsZ73bR6XruWH
RMLtFZUCHcwpBwrmCD0JYgfg+49vypCbufOdFnVO78KhQStnjCzb6YvmcQldt4x8
2BF/yyb6ztAM9V523YltEbcOCsP9PPOyNPvl7KTWCUiedra0Ly18M2abHjovSgL5
tGhHMvk4w5LwK75jndLoPB6NwCV9Tz3TZjZOhYTdnSGHmbhRLPZARf6EqzdzLwq6
eDXxYfnkGoF3JzHp3Lt0Bp4bGRmCYxDK0JkZQeTBxzPKLRX8gwKcZ/wvRk57ye81
YeBctVbHtCrkzZlpsjZoM/aKqoQqGW+CgjD7lSFrkBiS5Hnu8ygKn3zveSzKkUQ0
3jfxrGAG1H95hjGLk15c1YJn0Qg5Mf4Ll1DUCvAPcd2/8YXszSQJxPb1xuJvAyzs
0oXHeryiXb9nInThlJx6BCEmYhPg9nAX1plXVcMLWKLoMBY/fAA5CM9UNR6/bS1W
427na/4pRTSGOfXljg0v1vSraNUTC/HbKoRgjTNAGHq4pHRZOy9mNUaAnIQaLXXT
IjLRPDU1KJQxaZWWH0rfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAOy30oV7YZ+O
ZKjN6MwdsSiVaIepIqZElLrXiHjyRQalqGJMSGde/LdzTgQZwCchSBaihagbyRwK
E2pSnAukxtnZ9QqClqrYsdOKT3kM0nc3R+tCqvkYBt5pp5gOHH9O+7qcOkNMBGxn
KDSFuA5u21cB7d8WkQBVGN2ll6/wU9yL+wDKpubxRw/M3TCE5JV1g7m8hGbsph1r
twaRDlXTjGoFNLMTCLjMhzwfZ1m6DCUeJfnuCPGjcuSHqPL8ksZfMxQf50LkRR+G
QnYKiY33F9gyukyEQdXRGwyKmOY/MhmrT/UgNxP3OQ0dP4DUGXrqEvXeuMWuQvDZ
HoM7BKxWti0=
-----END CERTIFICATE-----
-52
View File
@@ -1,52 +0,0 @@
-----BEGIN PRIVATE KEY-----
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
1dbGt3WW9bPnV1QjLZmrGTGsgpbMJA==
-----END PRIVATE KEY-----
+8 -8
View File
@@ -25,26 +25,26 @@ CHANNEL=$4
#provision user:
printf "Provisoning user with email $EMAIL and password $PASSWORD \n"
curl -s -S --cacert docker/ssl/certs/mainflux-server.crt --insecure -X POST -H "Content-Type: application/json" https://localhost/users -d '{"credentials": {"identity": "'"$EMAIL"'","secret": "'"$PASSWORD"'"}, "status": "enabled", "role": "admin" }'
curl -s -S --cacert docker/ssl/certs/magistrala-server.crt --insecure -X POST -H "Content-Type: application/json" https://localhost/users -d '{"credentials": {"identity": "'"$EMAIL"'","secret": "'"$PASSWORD"'"}, "status": "enabled", "role": "admin" }'
#get jwt token
JWTTOKEN=$(curl -s -S --cacert docker/ssl/certs/mainflux-server.crt --insecure -X POST -H "Content-Type: application/json" https://localhost/users/tokens/issue -d '{"identity":"'"$EMAIL"'", "secret":"'"$PASSWORD"'"}' | grep -oP '"access_token":"\K[^"]+' )
JWTTOKEN=$(curl -s -S --cacert docker/ssl/certs/magistrala-server.crt --insecure -X POST -H "Content-Type: application/json" https://localhost/users/tokens/issue -d '{"identity":"'"$EMAIL"'", "secret":"'"$PASSWORD"'"}' | grep -oP '"access_token":"\K[^"]+' )
printf "JWT TOKEN for user is $JWTTOKEN \n"
#provision thing
printf "Provisioning thing with name $DEVICE \n"
DEVICEID=$(curl -s -S --cacert docker/ssl/certs/mainflux-server.crt --insecure -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $JWTTOKEN" https://localhost/things -d '{"name":"'"$DEVICE"'", "status": "enabled"}' | grep -oP '"id":"\K[^"]+' )
curl -s -S --cacert docker/ssl/certs/mainflux-server.crt --insecure -X GET -H "Content-Type: application/json" -H "Authorization: Bearer $JWTTOKEN" https://localhost/things/$DEVICEID
DEVICEID=$(curl -s -S --cacert docker/ssl/certs/magistrala-server.crt --insecure -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $JWTTOKEN" https://localhost/things -d '{"name":"'"$DEVICE"'", "status": "enabled"}' | grep -oP '"id":"\K[^"]+' )
curl -s -S --cacert docker/ssl/certs/magistrala-server.crt --insecure -X GET -H "Content-Type: application/json" -H "Authorization: Bearer $JWTTOKEN" https://localhost/things/$DEVICEID
#get thing token
DEVICETOKEN=$(curl -s -S --cacert docker/ssl/certs/mainflux-server.crt --insecure -H "Authorization: Bearer $JWTTOKEN" https://localhost/things/$DEVICEID | grep -oP '"secret":"\K[^"]+' )
DEVICETOKEN=$(curl -s -S --cacert docker/ssl/certs/magistrala-server.crt --insecure -H "Authorization: Bearer $JWTTOKEN" https://localhost/things/$DEVICEID | grep -oP '"secret":"\K[^"]+' )
printf "Device token is $DEVICETOKEN \n"
#provision channel
printf "Provisioning channel with name $CHANNEL \n"
CHANNELID=$(curl -s -S --cacert docker/ssl/certs/mainflux-server.crt --insecure -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $JWTTOKEN" https://localhost/channels -d '{"name":"'"$CHANNEL"'", "status": "enabled"}' | grep -oP '"id":"\K[^"]+' )
curl -s -S --cacert docker/ssl/certs/mainflux-server.crt --insecure -X GET -H "Content-Type: application/json" -H "Authorization: Bearer $JWTTOKEN" https://localhost/channels/$CHANNELID
CHANNELID=$(curl -s -S --cacert docker/ssl/certs/magistrala-server.crt --insecure -X POST -H "Content-Type: application/json" -H "Authorization: Bearer $JWTTOKEN" https://localhost/channels -d '{"name":"'"$CHANNEL"'", "status": "enabled"}' | grep -oP '"id":"\K[^"]+' )
curl -s -S --cacert docker/ssl/certs/magistrala-server.crt --insecure -X GET -H "Content-Type: application/json" -H "Authorization: Bearer $JWTTOKEN" https://localhost/channels/$CHANNELID
#connect thing to channel
printf "Connecting thing of id $DEVICEID to channel of id $CHANNELID \n"
curl -s -S --cacert docker/ssl/certs/mainflux-server.crt --insecure -X PUT -H "Authorization: Bearer $JWTTOKEN" https://localhost/channels/$CHANNELID/things/$DEVICEID
curl -s -S --cacert docker/ssl/certs/magistrala-server.crt --insecure -X PUT -H "Authorization: Bearer $JWTTOKEN" https://localhost/channels/$CHANNELID/things/$DEVICEID