From 4c0425a47e727b0da346e39e3e985a39f416de2a Mon Sep 17 00:00:00 2001
From: Hermes Agent <hermes@litecharms.co.za>
Date: Sun, 13 Sep 2026 11:57:16 +0200
Subject: [PATCH] Database refactor

---
 docker-compose.yml                            | 24 +++++++++----------
 .../appsettings.json                          | 21 ++++++++++------
 .../appsettings.json                          | 13 ++++++----
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a589053..172491e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       - AdminConfiguration__BasicConfiguration__BasePath=/
       
       # Postgres Database Overrides      
-      - ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
 
   litecharmssecurity.admin.api:
     image: skoruba-duende-identityserver-admin-api
@@ -46,13 +46,13 @@ services:
       - AdminApiConfiguration__IdentityServerBaseUrl=https://sts.security.khongisa.co.za
       
       # Postgres Database Overrides      
-      - ConnectionStrings__ConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__PersistedGrantDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__IdentityDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__AdminLogDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__AdminAuditLogDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__AdminConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__ConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__PersistedGrantDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__IdentityDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__AdminLogDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__AdminAuditLogDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__AdminConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
       
       # Operational Management Switches (Controlled via Dockhand UI variables)      
       - SeedConfiguration__ApplySeed=${APPLY_SEED:-true}
@@ -97,7 +97,7 @@ services:
       - SmtpConfiguration__Password=${SMTP_PASSWORD}
       
       # Postgres Database Overrides      
-      - ConnectionStrings__ConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__PersistedGrantDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__IdentityDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
-      - ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};
\ No newline at end of file
+      - ConnectionStrings__ConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__PersistedGrantDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__IdentityDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
+      - ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=${DB_NAME};User Id=skoruba;Password=${DB_PASSWORD};
\ No newline at end of file
diff --git a/src/LiteCharmsSecurity.Admin.Api/appsettings.json b/src/LiteCharmsSecurity.Admin.Api/appsettings.json
index 192138c..b133b6f 100644
--- a/src/LiteCharmsSecurity.Admin.Api/appsettings.json
+++ b/src/LiteCharmsSecurity.Admin.Api/appsettings.json
@@ -10,13 +10,20 @@
     "ForwardLimit": 1
   },
   "ConnectionStrings": {
-    "ConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "PersistedGrantDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "IdentityDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "AdminLogDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "AdminAuditLogDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "DataProtectionDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "AdminConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;"
+    //"ConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"PersistedGrantDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"IdentityDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"AdminLogDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"AdminAuditLogDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"DataProtectionDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"AdminConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;"
+    "ConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "PersistedGrantDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "IdentityDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "AdminLogDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "AdminAuditLogDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "DataProtectionDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "AdminConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;"
   },
   "AdminApiConfiguration": {
     "ApplicationName": "Lite Charms Security",
diff --git a/src/LiteCharmsSecurity.STS.Identity/appsettings.json b/src/LiteCharmsSecurity.STS.Identity/appsettings.json
index 510ee37..6f00b1c 100644
--- a/src/LiteCharmsSecurity.STS.Identity/appsettings.json
+++ b/src/LiteCharmsSecurity.STS.Identity/appsettings.json
@@ -1,9 +1,14 @@
 {
   "ConnectionStrings": {
-    "ConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "PersistedGrantDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "IdentityDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
-    "DataProtectionDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;"
+    //"ConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"PersistedGrantDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"IdentityDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    //"DataProtectionDbConnection": "Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=wsb7sebwm$BoZ9;"
+
+    "ConfigurationDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "PersistedGrantDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "IdentityDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;",
+    "DataProtectionDbConnection": "Server=192.168.1.170;Port=5432;Database=identity;User Id=skoruba;Password=wsb7sebwm$BoZ9;"
   },
   "DatabaseProviderConfiguration": {
     "ProviderType": "PostgreSQL"