Resolve merge conflicts and restore local configuration

- Keep local DuckDNS subdomain and token customizations
- Preserve user-specific Authelia configuration
- Maintain local docker-compose customizations
This commit is contained in:
Kelin
2026-01-31 23:32:42 -05:00
parent 6c4a3362e0
commit ea5e34935b
4 changed files with 35 additions and 46 deletions

View File

@@ -1,14 +1,12 @@
###############################################################
# Users Database #
###############################################################
# Template - Replace with your actual user information
# Generate password hash with: docker run authelia/authelia:latest authelia crypto hash generate pbkdf2 --password 'yourpassword'
users:
admin: # Change this username
displayname: "Administrator"
password: "GENERATE_NEW_PASSWORD_HASH" # Replace with actual hash
email: your-email@example.com # Replace with your email
kelin:
displayname: "Admin User"
password: "$argon2id$v=19$m=65536,t=3,p=4$a+3pIrywP/li9wy9J6UkMA$+3THyJiAnS/gNYnLaYtlsRCaYfgnnxsUyGZ4D3xGnUg"
email: kelinshomelab@gmail.com
groups:
- admins
- users