From 949211cd6fc5d3f1d779f99dcc7c18447b7a8605 Mon Sep 17 00:00:00 2001 From: Piotr Biernat Date: Thu, 5 Dec 2024 16:42:42 +0100 Subject: [PATCH] Update --- .app.config | 11 ++++++----- api-gateway/entrypoint.sh | 2 +- api-gateway/etc/tls.yml | 2 ++ api-gateway/etc/traefik.yml | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.app.config b/.app.config index 29a3a0f..1106367 100644 --- a/.app.config +++ b/.app.config @@ -1,13 +1,14 @@ { - "ID": "api-gateway", - "Name": "api-gateway", + "ID": "gateway", + "Name": "gw", "Address": "__IP__", + "Tags": ["api-gateway", "gateway", "https", "traefik"], "Port": 443, + "Kind": "ingress-gateway", "Check": { - "HTTP": "http://__IP__:443/ping", - "Interval": "10s", + "HTTP": "http://__IP__:8080/ping", + "Interval": "5s", "Timeout": "1s", - "Status": "passing", "DeregisterCriticalServiceAfter": "10s" } } \ No newline at end of file diff --git a/api-gateway/entrypoint.sh b/api-gateway/entrypoint.sh index 20a3cde..4571009 100755 --- a/api-gateway/entrypoint.sh +++ b/api-gateway/entrypoint.sh @@ -17,7 +17,7 @@ waitForService() done } -waitForService "api-registry:8500" +waitForService "api-registry:8501" # waitForService "api-registry:${API_REGISTRY_UI_PORT}" set -e diff --git a/api-gateway/etc/tls.yml b/api-gateway/etc/tls.yml index 8bda6af..45eec35 100644 --- a/api-gateway/etc/tls.yml +++ b/api-gateway/etc/tls.yml @@ -4,6 +4,8 @@ tls: keyFile: "/etc/traefik/certs/gw.key" - certFile: "/etc/traefik/certs/gw.local.crt" keyFile: "/etc/traefik/certs/gw.key" + - certFile: "/etc/traefik/certs/eventbus.internal.crt" + keyFile: "/etc/traefik/certs/eventbus.key" stores: default: defaultCertificate: diff --git a/api-gateway/etc/traefik.yml b/api-gateway/etc/traefik.yml index de7f602..d383d6b 100644 --- a/api-gateway/etc/traefik.yml +++ b/api-gateway/etc/traefik.yml @@ -33,7 +33,8 @@ entryPoints: serversTransport: insecureSkipVerify: true # dev only... rootCAs: - - /etc/traefik/certs/gw.internal.crt + # - /etc/traefik/certs/internalCA.crt + - /usr/local/share/ca-certificates/internalCA.crt ################################################################ ping: