Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Moved auth endpoint config to proxy rather than use a reverse proxy within the manager

Rich Turnereef39d49a17c
diff --git a/proxy/Dockerfile b/proxy/Dockerfile
index 2fe5d7136..0a600f845 100644
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@@ -27,8 +27,6 @@ ENV DOMAINNAME=${DOMAINNAME:-localhost}
ENV LOCAL_CERT_FILE=$LOCAL_CERT_FILE
ENV TERM xterm
ENV PROXY_LOGLEVEL notice
-ENV PROXY_BACKEND_HOST=${PROXY_BACKEND_HOST:-manager}
-ENV PROXY_BACKEND_PORT=${PROXY_BACKEND_PORT:-8080}
RUN mkdir /tmp/lua && cd /tmp/lua \
&& curl -sSL https://www.lua.org/ftp/lua-${LUA_VERSION}.tar.gz -o lua.tar.gz \
@@ -65,4 +63,4 @@ HEALTHCHECK --interval=3s --timeout=3s --start-period=2s --retries=30 CMD curl -
COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
-CMD ["run"]
\ No newline at end of file
+CMD ["run"]
diff --git a/proxy/haproxy.cfg b/proxy/haproxy.cfg
index 3c8aeaeb7..c8e52887f 100644
--- a/proxy/haproxy.cfg
+++ b/proxy/haproxy.cfg
@@ -66,7 +66,9 @@ frontend https
http-request add-header X-Forwarded-Port %fp
http-request add-header Strict-Transport-Security max-age=15768000
- use_backend proxy_backend
+ acl auth url_beg /auth
+ use_backend keycloak_backend if auth
+ use_backend manager_backend
listen mqtt
bind *:8883 ssl crt "${CERT_FILE}" no-sslv3 no-tls-tickets no-tlsv10 no-tlsv11
@@ -78,7 +80,10 @@ listen mqtt
option tcplog
balance leastconn
- server proxy_backend_host "${PROXY_BACKEND_HOST}":1883
+ server proxy_backend_host "manager:1883"
-backend proxy_backend
- server proxy_backend_host "${PROXY_BACKEND_HOST}":"${PROXY_BACKEND_PORT}"
+backend manager_backend
+ server proxy_backend_host "manager:8080"
+
+backend keycloak_backend
+ server proxy_backend_host "keycloak:8080"