Rename Lldap-Gmer4Lfe to Lldap and guard local containers in cleanup

This commit is contained in:
Gmer4Lfe
2026-06-26 17:56:20 -04:00
parent fbe6a54e41
commit 638aba20c0
6 changed files with 14 additions and 6 deletions
+1 -1
View File
@@ -193,7 +193,7 @@ FALLBACK_HOST2_COVERS_HOST1_TIER1=(
"Gmer4Lfe.com-DDNS" # ALWAYS FIRST — DNS coverage before anything else "Gmer4Lfe.com-DDNS" # ALWAYS FIRST — DNS coverage before anything else
"Emby" # media server — people are watching "Emby" # media server — people are watching
"NginxProxyManager" # reverse proxy — all external access routes through this "NginxProxyManager" # reverse proxy — all external access routes through this
"Lldap-Gmer4Lfe" # user directory — already warm, verify and keep "Lldap" # user directory — already warm, verify and keep
"Mariadb-Authelia" # auth database — already warm, verify and keep "Mariadb-Authelia" # auth database — already warm, verify and keep
"Redis-Authelia" # auth session cache — already warm, verify and keep "Redis-Authelia" # auth session cache — already warm, verify and keep
"Authelia" # SSO — already warm, serving users already "Authelia" # SSO — already warm, serving users already
+2 -2
View File
@@ -138,7 +138,7 @@ PARTNERSHIP_ONBOARD_NOTIFY=true # notify both servers on successful onboard
# Format: "ContainerName|WebUIPort" # Format: "ContainerName|WebUIPort"
HOST1_PARTNERSHIP_AUTH_WEBUIS=( HOST1_PARTNERSHIP_AUTH_WEBUIS=(
"NginxProxyManager|81" "NginxProxyManager|81"
"Lldap-Gmer4Lfe|17170" "Lldap|17170"
"Authelia|9091" "Authelia|9091"
"Authelia-Secondary|9092" "Authelia-Secondary|9092"
) )
@@ -154,7 +154,7 @@ HOST1_PARTNERSHIP_AUTH_STACK=(
"my-Authelia.xml" "my-Authelia.xml"
"my-Authelia-Secondary.xml" "my-Authelia-Secondary.xml"
"my-NginxProxyManager.xml" "my-NginxProxyManager.xml"
"my-Lldap-Gmer4Lfe.xml" "my-Lldap.xml"
) )
# XML templates pushed to mirror during onboard (arr stack). # XML templates pushed to mirror during onboard (arr stack).
+8
View File
@@ -431,6 +431,9 @@ cleanup_deployed_stack_locally() {
return 0 return 0
fi fi
local _local_short
_local_short=$(derive_short_name "${LOCAL_SERVER_NAME:-}")
log "Removing owner-deployed containers (auth/arr/services stacks) locally..." log "Removing owner-deployed containers (auth/arr/services stacks) locally..."
for xml_name in "${xml_names[@]}"; do for xml_name in "${xml_names[@]}"; do
[[ -z "$xml_name" ]] && continue [[ -z "$xml_name" ]] && continue
@@ -444,6 +447,11 @@ cleanup_deployed_stack_locally() {
cname=$(awk 'match($0,/<Name>([^<]+)<\/Name>/,a){print a[1];exit}' "$xml_file") cname=$(awk 'match($0,/<Name>([^<]+)<\/Name>/,a){print a[1];exit}' "$xml_file")
[[ -z "$cname" ]] && continue [[ -z "$cname" ]] && continue
if [[ -n "$_local_short" && "$cname" == *"$_local_short"* ]]; then
warn " $cname contains local server identity ($_local_short) — skipping to protect local containers"
continue
fi
if [[ "$DRY_RUN" == true ]]; then if [[ "$DRY_RUN" == true ]]; then
warn " DRY RUN — would stop + rm $cname" warn " DRY RUN — would stop + rm $cname"
warn " DRY RUN — would delete appdata for $cname" warn " DRY RUN — would delete appdata for $cname"
+1 -1
View File
@@ -519,7 +519,7 @@
# Logs each transfer to BANDWIDTH_LOG automatically (read by bandwidth_monitor --report). # Logs each transfer to BANDWIDTH_LOG automatically (read by bandwidth_monitor --report).
# #
# Profile behaviour — what containers stop: # Profile behaviour — what containers stop:
# critical-data Mariadb-Authelia, Redis-Authelia, NginxProxyManager, Lldap-Gmer4Lfe # critical-data Mariadb-Authelia, Redis-Authelia, NginxProxyManager, Lldap
# + delayed restart: Authelia, Authelia-Secondary (30s after dependencies) # + delayed restart: Authelia, Authelia-Secondary (30s after dependencies)
# important-data Postgres-NextCloud + delayed: NextCloud # important-data Postgres-NextCloud + delayed: NextCloud
# arrs_stack Sonarr, Radarr, Lidarr, Prowlarr, Bazarr, Pinchflat # arrs_stack Sonarr, Radarr, Lidarr, Prowlarr, Bazarr, Pinchflat
+1 -1
View File
@@ -68,7 +68,7 @@ break silently.
# #
Emby # the shared Emby — runs on HOST1, picked up by HOST2 on fallback Emby # the shared Emby — runs on HOST1, picked up by HOST2 on fallback
NginxProxyManager # shared NPM — runs on both, same config via sync NginxProxyManager # shared NPM — runs on both, same config via sync
Lldap-Gmer4Lfe # shared LLDAP — same user directory, both servers Lldap # shared LLDAP — same user directory, both servers
Authelia # shared auth — both servers, same config Authelia # shared auth — both servers, same config
Mariadb-Authelia # Authelia's database — same on both Mariadb-Authelia # Authelia's database — same on both
Redis-Authelia # Authelia's cache — same on both Redis-Authelia # Authelia's cache — same on both
+1 -1
View File
@@ -321,7 +321,7 @@ PROFILES["arrs_stack_CRITICAL_CONTAINER_NAMES"]=(
# Auth stack — stopped for clean database snapshot, Authelia delayed restart # Auth stack — stopped for clean database snapshot, Authelia delayed restart
PROFILES["critical-data_CRITICAL_CONTAINER_NAMES"]=( PROFILES["critical-data_CRITICAL_CONTAINER_NAMES"]=(
"Mariadb-Authelia" "Redis-Authelia" "Mariadb-Authelia" "Redis-Authelia"
"NginxProxyManager" "Lldap-Gmer4Lfe" "NginxProxyManager" "Lldap"
) )
PROFILES["critical-data_DELAYED_CONTAINERS"]=( PROFILES["critical-data_DELAYED_CONTAINERS"]=(
"Authelia" "Authelia-Secondary" "Authelia" "Authelia-Secondary"