Skip to content

Commit 5841d3f

Browse files
dborovcanindborovcanin
committed
NOISSUE - Update SMQ
Signed-off-by: dusan <borovcanindusan1@gmail.com>
1 parent f44b910 commit 5841d3f

File tree

6 files changed

+188
-158
lines changed

6 files changed

+188
-158
lines changed

‎docker/docker-compose.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -141,49 +141,49 @@ services:
141141
# Auth gRPC client certificates
142142
- type: bind
143143
source: ${MG_AUTH_GRPC_CLIENT_CERT:-ssl/certs/dummy/client_cert}
144-
target: /auth-grpc-client${MG_AUTH_GRPC_CLIENT_CERT:+.crt}
144+
target: /auth-grpc-client.crt
145145
bind:
146146
create_host_path: true
147147
- type: bind
148148
source: ${MG_AUTH_GRPC_CLIENT_KEY:-ssl/certs/dummy/client_key}
149-
target: /auth-grpc-client${MG_AUTH_GRPC_CLIENT_KEY:+.key}
149+
target: /auth-grpc-client.key
150150
bind:
151151
create_host_path: true
152152
- type: bind
153153
source: ${MG_AUTH_GRPC_SERVER_CA_CERTS:-ssl/certs/dummy/server_ca}
154-
target: /auth-grpc-server-ca${MG_AUTH_GRPC_SERVER_CA_CERTS:+.crt}
154+
target: /auth-grpc-server-ca.crt
155155
bind:
156156
create_host_path: true
157157
# Channels gRPC client certificates
158158
- type: bind
159159
source: ${SMQ_CHANNELS_GRPC_CLIENT_CERT:-ssl/certs/dummy/client_cert}
160-
target: /channels-grpc-client${SMQ_CHANNELS_GRPC_CLIENT_CERT:+.crt}
160+
target: /channels-grpc-client.crt
161161
bind:
162162
create_host_path: true
163163
- type: bind
164164
source: ${SMQ_CHANNELS_GRPC_CLIENT_KEY:-ssl/certs/dummy/client_key}
165-
target: /channels-grpc-client${SMQ_CHANNELS_GRPC_CLIENT_KEY:+.key}
165+
target: /channels-grpc-client.key
166166
bind:
167167
create_host_path: true
168168
- type: bind
169169
source: ${SMQ_CHANNELS_GRPC_SERVER_CA_CERTS:-ssl/certs/dummy/server_ca}
170-
target: /channels-grpc-server-ca${SMQ_CHANNELS_GRPC_SERVER_CA_CERTS:+.crt}
170+
target: /channels-grpc-server-ca.crt
171171
bind:
172172
create_host_path: true
173173
# Reader gRPC client certificates
174174
- type: bind
175175
source: ${MG_TIMESCALE_READER_GRPC_CLIENT_CERT:-ssl/certs/dummy/client_cert}
176-
target: /readers-grpc-client${MG_TIMESCALE_READER_GRPC_CLIENT_CERT:+.crt}
176+
target: /readers-grpc-client.crt
177177
bind:
178178
create_host_path: true
179179
- type: bind
180180
source: ${MG_TIMESCALE_READER_GRPC_CLIENT_KEY:-ssl/certs/dummy/client_key}
181-
target: /readers-grpc-client${MG_TIMESCALE_READER_GRPC_CLIENT_KEY:+.key}
181+
target: /readers-grpc-client.key
182182
bind:
183183
create_host_path: true
184184
- type: bind
185185
source: ${MG_TIMESCALE_READER_GRPC_SERVER_CA_CERTS:-ssl/certs/dummy/server_ca_certs}
186-
target: /readers-grpc-server-ca${MG_TIMESCALE_READER_GRPC_SERVER_CA_CERTS:+.crt}
186+
target: /readers-grpc-server-ca.crt
187187
bind:
188188
create_host_path: true
189189

@@ -344,17 +344,17 @@ services:
344344
# Auth gRPC client certificates
345345
- type: bind
346346
source: ${SMQ_AUTH_GRPC_CLIENT_CERT:-ssl/certs/dummy/client_cert}
347-
target: /auth-grpc-client${SMQ_AUTH_GRPC_CLIENT_CERT:+.crt}
347+
target: /auth-grpc-client.crt
348348
bind:
349349
create_host_path: true
350350
- type: bind
351351
source: ${SMQ_AUTH_GRPC_CLIENT_KEY:-ssl/certs/dummy/client_key}
352-
target: /auth-grpc-client${SMQ_AUTH_GRPC_CLIENT_KEY:+.key}
352+
target: /auth-grpc-client.key
353353
bind:
354354
create_host_path: true
355355
- type: bind
356356
source: ${SMQ_AUTH_GRPC_SERVER_CA_CERTS:-ssl/certs/dummy/server_ca}
357-
target: /auth-grpc-server-ca${SMQ_AUTH_GRPC_SERVER_CA_CERTS:+.crt}
357+
target: /auth-grpc-server-ca.crt
358358
bind:
359359
create_host_path: true
360360

@@ -428,32 +428,32 @@ services:
428428
# Auth gRPC client certificates
429429
- type: bind
430430
source: ${SMQ_AUTH_GRPC_CLIENT_CERT:-ssl/certs/dummy/client_cert}
431-
target: /auth-grpc-client${SMQ_AUTH_GRPC_CLIENT_CERT:+.crt}
431+
target: /auth-grpc-client.crt
432432
bind:
433433
create_host_path: true
434434
- type: bind
435435
source: ${SMQ_AUTH_GRPC_CLIENT_KEY:-ssl/certs/dummy/client_key}
436-
target: /auth-grpc-client${SMQ_AUTH_GRPC_CLIENT_KEY:+.key}
436+
target: /auth-grpc-client.key
437437
bind:
438438
create_host_path: true
439439
- type: bind
440440
source: ${SMQ_AUTH_GRPC_SERVER_CA_CERTS:-ssl/certs/dummy/server_ca}
441-
target: /auth-grpc-server-ca${SMQ_AUTH_GRPC_SERVER_CA_CERTS:+.crt}
441+
target: /auth-grpc-server-ca.crt
442442
bind:
443443
create_host_path: true
444444
- type: bind
445445
source: ${SMQ_DOMAINS_GRPC_CLIENT_CERT:-ssl/certs/dummy/client_cert}
446-
target: /domains-grpc-client${SMQ_DOMAINS_GRPC_CLIENT_CERT:+.crt}
446+
target: /domains-grpc-client.crt
447447
bind:
448448
create_host_path: true
449449
- type: bind
450450
source: ${SMQ_DOMAINS_GRPC_CLIENT_KEY:-ssl/certs/dummy/client_key}
451-
target: /domains-grpc-client${SMQ_DOMAINS_GRPC_CLIENT_KEY:+.key}
451+
target: /domains-grpc-client.key
452452
bind:
453453
create_host_path: true
454454
- type: bind
455455
source: ${SMQ_DOMAINS_GRPC_SERVER_CA_CERTS:-ssl/certs/dummy/server_ca}
456-
target: /domains-grpc-server-ca${SMQ_DOMAINS_GRPC_SERVER_CA_CERTS:+.crt}
456+
target: /domains-grpc-server-ca.crt
457457
bind:
458458
create_host_path: true
459459

@@ -542,17 +542,17 @@ services:
542542
# Auth gRPC client certificates
543543
- type: bind
544544
source: ${SMQ_AUTH_GRPC_CLIENT_CERT:-ssl/certs/dummy/client_cert}
545-
target: /auth-grpc-client${SMQ_AUTH_GRPC_CLIENT_CERT:+.crt}
545+
target: /auth-grpc-client.crt
546546
bind:
547547
create_host_path: true
548548
- type: bind
549549
source: ${SMQ_AUTH_GRPC_CLIENT_KEY:-ssl/certs/dummy/client_key}
550-
target: /auth-grpc-client${SMQ_AUTH_GRPC_CLIENT_KEY:+.key}
550+
target: /auth-grpc-client.key
551551
bind:
552552
create_host_path: true
553553
- type: bind
554554
source: ${SMQ_AUTH_GRPC_SERVER_CA_CERTS:-ssl/certs/dummy/server_ca}
555-
target: /auth-grpc-server-ca${SMQ_AUTH_GRPC_SERVER_CA_CERTS:+.crt}
555+
target: /auth-grpc-server-ca.crt
556556
bind:
557557
create_host_path: true
558558

‎docker/supermq-docker-compose.override.yaml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@ services:
190190

191191
AM_AUTH_GRPC_URL: ${AM_AUTH_GRPC_URL}
192192
AM_AUTH_GRPC_TIMEOUT: ${AM_AUTH_GRPC_TIMEOUT}
193-
AM_AUTH_GRPC_CLIENT_CERT: ${AM_AUTH_GRPC_CLIENT_CERT}
194-
AM_AUTH_GRPC_CLIENT_KEY: ${AM_AUTH_GRPC_CLIENT_KEY}
195-
AM_AUTH_GRPC_SERVER_CA_CERTS: ${AM_AUTH_GRPC_SERVER_CA_CERTS}
193+
AM_AUTH_GRPC_CLIENT_CERT: ${AM_AUTH_GRPC_CLIENT_CERT:+/auth-grpc-client.crt}
194+
AM_AUTH_GRPC_CLIENT_KEY: ${AM_AUTH_GRPC_CLIENT_KEY:+/auth-grpc-client.key}
195+
AM_AUTH_GRPC_SERVER_CA_CERTS: ${AM_AUTH_GRPC_SERVER_CA_CERTS:+/auth-grpc-server-ca.crt}
196196
AM_DOMAINS_GRPC_URL: ${AM_DOMAINS_GRPC_URL}
197197
AM_DOMAINS_GRPC_TIMEOUT: ${AM_DOMAINS_GRPC_TIMEOUT}
198-
AM_DOMAINS_GRPC_CLIENT_CERT: ${AM_DOMAINS_GRPC_CLIENT_CERT}
199-
AM_DOMAINS_GRPC_CLIENT_KEY: ${AM_DOMAINS_GRPC_CLIENT_KEY}
200-
AM_DOMAINS_GRPC_SERVER_CA_CERTS: ${AM_DOMAINS_GRPC_SERVER_CA_CERTS}
198+
AM_DOMAINS_GRPC_CLIENT_CERT: ${AM_DOMAINS_GRPC_CLIENT_CERT:+/domains-grpc-client.crt}
199+
AM_DOMAINS_GRPC_CLIENT_KEY: ${AM_DOMAINS_GRPC_CLIENT_KEY:+/domains-grpc-client.key}
200+
AM_DOMAINS_GRPC_SERVER_CA_CERTS: ${AM_DOMAINS_GRPC_SERVER_CA_CERTS:+/domains-grpc-server-ca.crt}
201201
networks: !override
202202
- magistrala-base-net
203203

@@ -208,10 +208,10 @@ services:
208208
- ../../docker/nginx/entrypoint.sh:/docker-entrypoint.d/entrypoint.sh
209209
- type: bind
210210
source: ${SMQ_NGINX_SERVER_CERT:-../../docker/ssl/certs/magistrala-server.crt}
211-
target: /etc/ssl/certs/magistrala-server.crt
211+
target: /etc/ssl/certs/supermq-server.crt
212212
- type: bind
213213
source: ${SMQ_NGINX_SERVER_KEY:-../../docker/ssl/certs/magistrala-server.key}
214-
target: /etc/ssl/private/magistrala-server.key
214+
target: /etc/ssl/private/supermq-server.key
215215
- type: bind
216216
source: ${SMQ_NGINX_SERVER_CLIENT_CA:-../../docker/ssl/certs/ca.crt}
217217
target: /etc/ssl/certs/ca.crt
@@ -224,4 +224,3 @@ services:
224224
- ./.env
225225
- ../../docker/.env
226226

227-

‎docker/supermq-docker/.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ AM_JAEGER_URL=http://jaeger:4318/v1/traces
496496
AM_JAEGER_TRACE_RATIO=1.0
497497

498498
#### Auth Client Config for Certs Service
499+
SMQ_ADDONS_CERTS_PATH_PREFIX=
499500
AM_AUTH_GRPC_URL=auth:7001
500501
AM_AUTH_GRPC_TIMEOUT=300s
501502
AM_AUTH_GRPC_CLIENT_CERT=${GRPC_MTLS:+./ssl/certs/auth-grpc-client.crt}

‎docker/supermq-docker/addons/certs/docker-compose.yaml‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ services:
4646
AM_CERTS_DB_SSL_MODE: ${AM_CERTS_DB_SSL_MODE}
4747
AM_AUTH_GRPC_URL: ${AM_AUTH_GRPC_URL}
4848
AM_AUTH_GRPC_TIMEOUT: ${AM_AUTH_GRPC_TIMEOUT}
49-
AM_AUTH_GRPC_CLIENT_CERT: ${AM_AUTH_GRPC_CLIENT_CERT}
50-
AM_AUTH_GRPC_CLIENT_KEY: ${AM_AUTH_GRPC_CLIENT_KEY}
51-
AM_AUTH_GRPC_SERVER_CA_CERTS: ${AM_AUTH_GRPC_SERVER_CA_CERTS}
49+
AM_AUTH_GRPC_CLIENT_CERT: ${AM_AUTH_GRPC_CLIENT_CERT:+/auth-grpc-client.crt}
50+
AM_AUTH_GRPC_CLIENT_KEY: ${AM_AUTH_GRPC_CLIENT_KEY:+/auth-grpc-client.key}
51+
AM_AUTH_GRPC_SERVER_CA_CERTS: ${AM_AUTH_GRPC_SERVER_CA_CERTS:+/auth-grpc-server-ca.crt}
5252
AM_DOMAINS_GRPC_URL: ${AM_DOMAINS_GRPC_URL}
5353
AM_DOMAINS_GRPC_TIMEOUT: ${AM_DOMAINS_GRPC_TIMEOUT}
5454
AM_DOMAINS_GRPC_CLIENT_CERT: ${AM_DOMAINS_GRPC_CLIENT_CERT:+/domains-grpc-client.crt}
@@ -65,6 +65,36 @@ services:
6565
- ${AM_CERTS_GRPC_PORT}:${AM_CERTS_GRPC_PORT}
6666
volumes:
6767
- openbao-data:/openbao:ro
68+
- type: bind
69+
source: ${SMQ_ADDONS_CERTS_PATH_PREFIX}${AM_AUTH_GRPC_CLIENT_CERT:-./ssl/certs/dummy/client_cert}
70+
target: /auth-grpc-client.crt
71+
bind:
72+
create_host_path: true
73+
- type: bind
74+
source: ${SMQ_ADDONS_CERTS_PATH_PREFIX}${AM_AUTH_GRPC_CLIENT_KEY:-./ssl/certs/dummy/client_key}
75+
target: /auth-grpc-client.key
76+
bind:
77+
create_host_path: true
78+
- type: bind
79+
source: ${SMQ_ADDONS_CERTS_PATH_PREFIX}${AM_AUTH_GRPC_SERVER_CA_CERTS:-./ssl/certs/dummy/server_ca}
80+
target: /auth-grpc-server-ca.crt
81+
bind:
82+
create_host_path: true
83+
- type: bind
84+
source: ${SMQ_ADDONS_CERTS_PATH_PREFIX}${AM_DOMAINS_GRPC_CLIENT_CERT:-./ssl/certs/dummy/client_cert}
85+
target: /domains-grpc-client.crt
86+
bind:
87+
create_host_path: true
88+
- type: bind
89+
source: ${SMQ_ADDONS_CERTS_PATH_PREFIX}${AM_DOMAINS_GRPC_CLIENT_KEY:-./ssl/certs/dummy/client_key}
90+
target: /domains-grpc-client.key
91+
bind:
92+
create_host_path: true
93+
- type: bind
94+
source: ${SMQ_ADDONS_CERTS_PATH_PREFIX}${AM_DOMAINS_GRPC_SERVER_CA_CERTS:-./ssl/certs/dummy/server_ca}
95+
target: /domains-grpc-server-ca.crt
96+
bind:
97+
create_host_path: true
6898

6999
certs-db:
70100
image: postgres:16.2-alpine

‎docker/supermq-docker/certs-docker-compose-override.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ services:
4949
AM_JAEGER_TRACE_RATIO: ${AM_JAEGER_TRACE_RATIO}
5050
AM_AUTH_GRPC_URL: ${AM_AUTH_GRPC_URL}
5151
AM_AUTH_GRPC_TIMEOUT: ${AM_AUTH_GRPC_TIMEOUT}
52-
AM_AUTH_GRPC_CLIENT_CERT: ${AM_AUTH_GRPC_CLIENT_CERT}
53-
AM_AUTH_GRPC_CLIENT_KEY: ${AM_AUTH_GRPC_CLIENT_KEY}
54-
AM_AUTH_GRPC_SERVER_CA_CERTS: ${AM_AUTH_GRPC_SERVER_CA_CERTS}
52+
AM_AUTH_GRPC_CLIENT_CERT: ${AM_AUTH_GRPC_CLIENT_CERT:+/auth-grpc-client.crt}
53+
AM_AUTH_GRPC_CLIENT_KEY: ${AM_AUTH_GRPC_CLIENT_KEY:+/auth-grpc-client.key}
54+
AM_AUTH_GRPC_SERVER_CA_CERTS: ${AM_AUTH_GRPC_SERVER_CA_CERTS:+/auth-grpc-server-ca.crt}
5555
AM_DOMAINS_GRPC_URL: ${AM_DOMAINS_GRPC_URL}
5656
AM_DOMAINS_GRPC_TIMEOUT: ${AM_DOMAINS_GRPC_TIMEOUT}
57-
AM_DOMAINS_GRPC_CLIENT_CERT: ${AM_DOMAINS_GRPC_CLIENT_CERT}
58-
AM_DOMAINS_GRPC_CLIENT_KEY: ${AM_DOMAINS_GRPC_CLIENT_KEY}
59-
AM_DOMAINS_GRPC_SERVER_CA_CERTS: ${AM_DOMAINS_GRPC_SERVER_CA_CERTS}
57+
AM_DOMAINS_GRPC_CLIENT_CERT: ${AM_DOMAINS_GRPC_CLIENT_CERT:+/domains-grpc-client.crt}
58+
AM_DOMAINS_GRPC_CLIENT_KEY: ${AM_DOMAINS_GRPC_CLIENT_KEY:+/domains-grpc-client.key}
59+
AM_DOMAINS_GRPC_SERVER_CA_CERTS: ${AM_DOMAINS_GRPC_SERVER_CA_CERTS:+/domains-grpc-server-ca.crt}
6060
networks: !override
6161
- supermq-base-net
6262

0 commit comments

Comments
 (0)