Container-plane docker now routes through the mode-aware helpers instead of sudo: simple calls (exec/ps/run/build/images/inspect/port/logs across ~15 app/check scripts) -> runFileOp docker (rootless socket as the install user; rooted via the docker group). The cd && docker compose paths drop the sudo on the rooted branch (the rootless branch already used dockerCommandRunInstallUser -- byte-identical now, manager-ready later); gluetun, which had no rootless branch, now uses dockerCommandRun so force-recreate works in both modes. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Signed-off-by: librelad <librelad@digitalangels.vip>
63 lines
2.4 KiB
Bash
63 lines
2.4 KiB
Bash
#!/bin/bash
|
|
|
|
_giteaCmd() {
|
|
runFileOp docker exec -u git gitea-service gitea admin "$@" 2>&1
|
|
}
|
|
|
|
authAdapter_gitea_setPassword() {
|
|
local user="$1" password="$2"
|
|
[[ -z "$user" ]] && { isError "Username is required."; return 1; }
|
|
[[ -z "$password" ]] && password=$(generateRandomPassword)
|
|
|
|
local out
|
|
out=$(_giteaCmd user change-password --username "$user" --password "$password")
|
|
if [[ $? -ne 0 ]]; then isError "Gitea reset failed: $out"; return 1; fi
|
|
|
|
if [[ "$user" == "${CFG_GITEA_ADMIN_USER:-}" ]]; then
|
|
authPersistCfg gitea ADMIN_PASSWORD "$password"
|
|
fi
|
|
isSuccessful "Gitea password set for $user — New password: $password"
|
|
}
|
|
|
|
authAdapter_gitea_createUser() {
|
|
local user="$1" password="$2" email="$3" isAdmin="$4"
|
|
[[ -z "$user" || -z "$email" ]] && { isError "Username and email are required."; return 1; }
|
|
[[ -z "$password" ]] && password=$(generateRandomPassword)
|
|
|
|
local args=(user create --username "$user" --password "$password" --email "$email" --must-change-password=false)
|
|
[[ "$isAdmin" == "true" ]] && args+=(--admin)
|
|
local out
|
|
out=$(_giteaCmd "${args[@]}")
|
|
if [[ $? -ne 0 ]]; then isError "Gitea create failed: $out"; return 1; fi
|
|
|
|
if [[ "$isAdmin" == "true" && -z "${CFG_GITEA_ADMIN_USER:-}" ]]; then
|
|
authPersistCfg gitea ADMIN_USER "$user"
|
|
authPersistCfg gitea ADMIN_PASSWORD "$password"
|
|
fi
|
|
isSuccessful "Gitea user created — User: $user — Email: $email — Password: $password"
|
|
}
|
|
|
|
authAdapter_gitea_listUsers() {
|
|
_giteaCmd user list | awk 'NR>1 && NF>=3 {
|
|
admin = ($5=="true") ? "admin" : "user"
|
|
printf "EZ_USER\t%s\t%s\t%s\n", $3, $2, admin
|
|
}'
|
|
}
|
|
|
|
authAdapter_gitea_deleteUser() {
|
|
local user="$1"
|
|
[[ -z "$user" ]] && { isError "Username is required."; return 1; }
|
|
local out; out=$(_giteaCmd user delete --username "$user")
|
|
[[ $? -ne 0 ]] && { isError "Gitea delete failed: $out"; return 1; }
|
|
isSuccessful "Gitea user '$user' deleted."
|
|
}
|
|
|
|
authAdapter_gitea_setAdmin() {
|
|
local user="$1" isAdmin="$2"
|
|
[[ -z "$user" ]] && { isError "Username is required."; return 1; }
|
|
local args
|
|
if [[ "$isAdmin" == "true" ]]; then args=(--admin); else args=(--admin=false); fi
|
|
local out; out=$(_giteaCmd user change-password --username "$user" "${args[@]}" 2>&1 || _giteaCmd user must-change-password --username "$user" 2>&1)
|
|
isSuccessful "Gitea user '$user' admin → $isAdmin (CLI may need a restart to fully refresh)."
|
|
}
|