kelin/EZ-Homelab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Docker Compose variable substitution for password hashes

Browse Source 
- Escape $ characters in AUTHELIA_ADMIN_PASSWORD_HASH in deployed .env file
- Prevent Docker Compose from interpreting password hash as environment variables
- Update ez-homelab.sh to source common.sh and use specialized users_database.yml processing
This commit is contained in:
Kelin
2026-02-03 22:58:52 -05:00
parent 59cd225e0e
commit 5a4360bc53
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/ez-homelab.sh
View File

@@ -371,6 +371,9 @@ setup_multi_server_tls() {
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
REPO_DIR="$( cd "$SCRIPT_DIR/.." && pwd )" REPO_DIR="$( cd "$SCRIPT_DIR/.." && pwd )"
# Source common functions
source "$REPO_DIR/scripts/common.sh"
# Get actual user # Get actual user
if [ "$EUID" -eq 0 ]; then if [ "$EUID" -eq 0 ]; then
ACTUAL_USER=${SUDO_USER:-$USER} ACTUAL_USER=${SUDO_USER:-$USER}
@@ -882,6 +885,9 @@ deploy_core() {
sudo chown "$ACTUAL_USER:$ACTUAL_USER" /opt/stacks/core/docker-compose.yml sudo chown "$ACTUAL_USER:$ACTUAL_USER" /opt/stacks/core/docker-compose.yml
sudo chown "$ACTUAL_USER:$ACTUAL_USER" /opt/stacks/core/.env sudo chown "$ACTUAL_USER:$ACTUAL_USER" /opt/stacks/core/.env
# Escape $ characters in password hashes to prevent Docker Compose variable substitution
sed -i '/^AUTHELIA_ADMIN_PASSWORD_HASH=/ s/\$/\\$/g' /opt/stacks/core/.env
# Remove variables that core stack doesn't need # Remove variables that core stack doesn't need
sed -i '/^QBITTORRENT_/d' /opt/stacks/core/.env sed -i '/^QBITTORRENT_/d' /opt/stacks/core/.env
sed -i '/^GRAFANA_/d' /opt/stacks/core/.env sed -i '/^GRAFANA_/d' /opt/stacks/core/.env
@@ -956,7 +962,11 @@ deploy_core() {
# Replace all placeholders in Authelia config files # Replace all placeholders in Authelia config files
debug_log "Replacing placeholders in Authelia config files" debug_log "Replacing placeholders in Authelia config files"
for config_file in $(find /opt/stacks/core/authelia -name "*.yml" -type f); do for config_file in $(find /opt/stacks/core/authelia -name "*.yml" -type f); do
localize_yml_file "$config_file" true if [[ "$config_file" == *"users_database.yml" ]]; then
localize_users_database_file "$config_file"
else
localize_yml_file "$config_file" true
fi
done done
# Remove invalid session.cookies section from Authelia config (not supported in v4.37.5) # Remove invalid session.cookies section from Authelia config (not supported in v4.37.5)