dohertj2/ScadaBridge
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat(auth): point dev clusters at shared GLAuth 10.100.0.35; retire local scadabridge-ldap

Browse Source 
Both :9000 (docker) and :9100 (docker-env2) central nodes now bind the shared dev
GLAuth (scadaproj/infra/glauth/, dc=zb,dc=local) via the cn=serviceaccount search
account instead of the bundled scadabridge-ldap container (now commented out in
infra/docker-compose.yml, kept for rollback). Verified: multi-role -> all 4 roles
on both clusters with scadabridge-ldap stopped.
This commit is contained in:
Joseph Doherty
2026-06-04 15:58:42 -04:00
parent 0e2d9ed186
commit 244207c0db
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-env2/central-node-a/appsettings.Central.json
+3 -3
View File
@@ -23,13 +23,13 @@
}, },
"Security": { "Security": {
"Ldap": { "Ldap": {
"Server": "scadabridge-ldap", "Server": "10.100.0.35",
"Port": 3893, "Port": 3893,
"Transport": "None", "Transport": "None",
"AllowInsecure": true, "AllowInsecure": true,
"SearchBase": "dc=zb,dc=local", "SearchBase": "dc=zb,dc=local",
"ServiceAccountDn": "cn=admin,dc=zb,dc=local", "ServiceAccountDn": "cn=serviceaccount,dc=zb,dc=local",
"ServiceAccountPassword": "password" "ServiceAccountPassword": "serviceaccount123"
}, },
"JwtSigningKey": "scadabridge-env2-dev-jwt-signing-key-must-be-at-least-32-characters-long", "JwtSigningKey": "scadabridge-env2-dev-jwt-signing-key-must-be-at-least-32-characters-long",
"JwtExpiryMinutes": 15, "JwtExpiryMinutes": 15,
docker-env2/central-node-b/appsettings.Central.json
+3 -3
View File
@@ -23,13 +23,13 @@
}, },
"Security": { "Security": {
"Ldap": { "Ldap": {
"Server": "scadabridge-ldap", "Server": "10.100.0.35",
"Port": 3893, "Port": 3893,
"Transport": "None", "Transport": "None",
"AllowInsecure": true, "AllowInsecure": true,
"SearchBase": "dc=zb,dc=local", "SearchBase": "dc=zb,dc=local",
"ServiceAccountDn": "cn=admin,dc=zb,dc=local", "ServiceAccountDn": "cn=serviceaccount,dc=zb,dc=local",
"ServiceAccountPassword": "password" "ServiceAccountPassword": "serviceaccount123"
}, },
"JwtSigningKey": "scadabridge-env2-dev-jwt-signing-key-must-be-at-least-32-characters-long", "JwtSigningKey": "scadabridge-env2-dev-jwt-signing-key-must-be-at-least-32-characters-long",
"JwtExpiryMinutes": 15, "JwtExpiryMinutes": 15,
docker/central-node-a/appsettings.Central.json
+3 -3
View File
@@ -23,13 +23,13 @@
}, },
"Security": { "Security": {
"Ldap": { "Ldap": {
"Server": "scadabridge-ldap", "Server": "10.100.0.35",
"Port": 3893, "Port": 3893,
"Transport": "None", "Transport": "None",
"AllowInsecure": true, "AllowInsecure": true,
"SearchBase": "dc=zb,dc=local", "SearchBase": "dc=zb,dc=local",
"ServiceAccountDn": "cn=admin,dc=zb,dc=local", "ServiceAccountDn": "cn=serviceaccount,dc=zb,dc=local",
"ServiceAccountPassword": "password" "ServiceAccountPassword": "serviceaccount123"
}, },
"JwtSigningKey": "scadabridge-dev-jwt-signing-key-must-be-at-least-32-characters-long", "JwtSigningKey": "scadabridge-dev-jwt-signing-key-must-be-at-least-32-characters-long",
"JwtExpiryMinutes": 15, "JwtExpiryMinutes": 15,
docker/central-node-b/appsettings.Central.json
+3 -3
View File
@@ -23,13 +23,13 @@
}, },
"Security": { "Security": {
"Ldap": { "Ldap": {
"Server": "scadabridge-ldap", "Server": "10.100.0.35",
"Port": 3893, "Port": 3893,
"Transport": "None", "Transport": "None",
"AllowInsecure": true, "AllowInsecure": true,
"SearchBase": "dc=zb,dc=local", "SearchBase": "dc=zb,dc=local",
"ServiceAccountDn": "cn=admin,dc=zb,dc=local", "ServiceAccountDn": "cn=serviceaccount,dc=zb,dc=local",
"ServiceAccountPassword": "password" "ServiceAccountPassword": "serviceaccount123"
}, },
"JwtSigningKey": "scadabridge-dev-jwt-signing-key-must-be-at-least-32-characters-long", "JwtSigningKey": "scadabridge-dev-jwt-signing-key-must-be-at-least-32-characters-long",
"JwtExpiryMinutes": 15, "JwtExpiryMinutes": 15,
infra/docker-compose.yml
+15 -10
View File
@@ -41,16 +41,21 @@ services:
- scadabridge-net - scadabridge-net
restart: unless-stopped restart: unless-stopped
ldap: # RETIRED 2026-06-04: superseded by the shared dev GLAuth on 10.100.0.35:3893
image: glauth/glauth:latest # (scadaproj/infra/glauth/). The central nodes now bind there (see
container_name: scadabridge-ldap # docker/ + docker-env2 central-node appsettings: Ldap:Server=10.100.0.35).
ports: # Kept here, commented, for rollback — uncomment + `docker compose up -d ldap`
- "3893:3893" # and revert the central-node Server back to "scadabridge-ldap".
volumes: # ldap:
- ./glauth/config.toml:/app/config/config.cfg:ro # image: glauth/glauth:latest
networks: # container_name: scadabridge-ldap
- scadabridge-net # ports:
restart: unless-stopped # - "3893:3893"
# volumes:
# - ./glauth/config.toml:/app/config/config.cfg:ro
# networks:
# - scadabridge-net
# restart: unless-stopped
mssql: mssql:
image: mcr.microsoft.com/mssql/server:2022-latest image: mcr.microsoft.com/mssql/server:2022-latest