Skip to content

Commit d1b34d7

Browse files
committed
chore: update nginx config for magistrala
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
1 parent caf7b7d commit d1b34d7

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

docker/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ SMQ_SPICEDB_DB_PORT=5432
145145
### SpiceDB config
146146
SMQ_SPICEDB_PRE_SHARED_KEY="12345678"
147147
SMQ_SPICEDB_SCHEMA_FILE="/schema.zed"
148-
SMQ_SPICEDB_HOST=magistrala-spicedb
148+
SMQ_SPICEDB_HOST=supermq-spicedb
149149
SMQ_SPICEDB_PORT=50051
150150
SMQ_SPICEDB_DATASTORE_ENGINE=postgres
151151

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: "magistrala"
66
include:
77
- path:
88
- ../supermq/docker/docker-compose.yml
9-
- ./supermq-docker-compose.override.yml
9+
- ../docker/supermq-docker-compose.override.yml
1010
env_file:
1111
- ../supermq/docker/.env
1212

docker/supermq-docker-compose.override.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ services:
3838
networks: !override
3939
- magistrala-base-net
4040

41-
nginx:
42-
networks: !override
43-
- magistrala-base-net
44-
4541
clients-db:
4642
networks: !override
4743
- magistrala-base-net
@@ -105,3 +101,29 @@ services:
105101
nats:
106102
networks: !override
107103
- magistrala-base-net
104+
105+
nginx:
106+
image: nginx:1.25.4-alpine
107+
container_name: magistrala-nginx
108+
restart: on-failure
109+
volumes:
110+
- ../../nginx/nginx-${AUTH-key}.conf:/etc/nginx/nginx.conf.template
111+
- ../../nginx/entrypoint.sh:/docker-entrypoint.d/entrypoint.sh
112+
- ../../nginx/snippets:/etc/nginx/snippets
113+
- ../../ssl/authorization.js:/etc/nginx/authorization.js
114+
- type: bind
115+
source: ${SMQ_NGINX_SERVER_CERT:-../../docker/ssl/certs/magistrala-server.crt}
116+
target: /etc/ssl/certs/magistrala-server.crt
117+
- type: bind
118+
source: ${SMQ_NGINX_SERVER_KEY:-../../docker/ssl/certs/magistrala-server.key}
119+
target: /etc/ssl/private/magistrala-server.key
120+
- type: bind
121+
source: ${SMQ_NGINX_SERVER_CLIENT_CA:-../../docker/ssl/certs/ca.crt}
122+
target: /etc/ssl/certs/ca.crt
123+
- type: bind
124+
source: ${SMQ_NGINX_SERVER_DHPARAM:-../../docker/ssl/dhparam.pem}
125+
target: /etc/ssl/certs/dhparam.pem
126+
networks:
127+
- magistrala-base-net
128+
env_file:
129+
- ../../docker/.env

0 commit comments

Comments
 (0)