mirror of
https://github.com/dehydrated-io/dehydrated.git
synced 2026-01-11 22:30:44 +01:00
added option to pass environment variables over sudo
This commit is contained in:
@@ -2,7 +2,8 @@
|
||||
This file contains a log of major changes in dehydrated
|
||||
|
||||
## [x.x.x] - xxxx-xx-xx
|
||||
...
|
||||
## Added
|
||||
- New config variable `DEHYDRATED_SUDO_ENV` to allow passing environment variables over sudo calls
|
||||
|
||||
## [0.7.1] - 2022-10-31
|
||||
## Changed
|
||||
|
||||
13
dehydrated
13
dehydrated
@@ -390,6 +390,7 @@ load_config() {
|
||||
AUTO_CLEANUP="no"
|
||||
DEHYDRATED_USER=
|
||||
DEHYDRATED_GROUP=
|
||||
DEHYDRATED_SUDO_ENV="no"
|
||||
API="auto"
|
||||
|
||||
if [[ -z "${CONFIG:-}" ]]; then
|
||||
@@ -442,7 +443,11 @@ load_config() {
|
||||
if [[ -z "${DEHYDRATED_GROUP}" ]]; then
|
||||
if [[ "${EUID}" != "${TARGET_UID}" ]]; then
|
||||
echo "# INFO: Running $0 as ${DEHYDRATED_USER}"
|
||||
has_sudo && exec sudo -u "${DEHYDRATED_USER}" "${0}" "${ORIGARGS[@]}"
|
||||
if [ "${DEHYDRATED_SUDO_ENV}" = "yes" ]; then
|
||||
has_sudo && exec sudo -E -H -u "${DEHYDRATED_USER}" "${0}" "${ORIGARGS[@]}"
|
||||
else
|
||||
has_sudo && exec sudo -u "${DEHYDRATED_USER}" "${0}" "${ORIGARGS[@]}"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
TARGET_GID="$(getent group "${DEHYDRATED_GROUP}" | cut -d':' -f3)" || _exiterr "DEHYDRATED_GROUP ${DEHYDRATED_GROUP} is invalid"
|
||||
@@ -452,7 +457,11 @@ load_config() {
|
||||
fi
|
||||
if [[ "${EUID}" != "${TARGET_UID}" ]] || [[ "${EGID}" != "${TARGET_GID}" ]]; then
|
||||
echo "# INFO: Running $0 as ${DEHYDRATED_USER}/${DEHYDRATED_GROUP}"
|
||||
has_sudo && exec sudo -u "${DEHYDRATED_USER}" -g "${DEHYDRATED_GROUP}" "${0}" "${ORIGARGS[@]}"
|
||||
if [ "${DEHYDRATED_SUDO_ENV}" = "yes" ]; then
|
||||
has_sudo && exec sudo -E -H -u "${DEHYDRATED_USER}" -g "${DEHYDRATED_GROUP}" "${0}" "${ORIGARGS[@]}"
|
||||
else
|
||||
has_sudo && exec sudo -u "${DEHYDRATED_USER}" -g "${DEHYDRATED_GROUP}" "${0}" "${ORIGARGS[@]}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
elif [[ -n "${DEHYDRATED_GROUP}" ]]; then
|
||||
|
||||
@@ -16,6 +16,9 @@
|
||||
# Which group should dehydrated run as? This will be implicitly enforced when running as root
|
||||
#DEHYDRATED_GROUP=
|
||||
|
||||
# Should dehydrated pass environment variables over sudo?
|
||||
#DEHYDRATED_SUDO_ENV="no"
|
||||
|
||||
# Resolve names to addresses of IP version only. (curl)
|
||||
# supported values: 4, 6
|
||||
# default: <unset>
|
||||
|
||||
Reference in New Issue
Block a user