mirror of
https://github.com/dehydrated-io/dehydrated.git
synced 2026-05-06 23:23:26 +02:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
911a822c0c |
@@ -2,7 +2,8 @@
|
|||||||
This file contains a log of major changes in dehydrated
|
This file contains a log of major changes in dehydrated
|
||||||
|
|
||||||
## [x.x.x] - xxxx-xx-xx
|
## [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
|
## [0.7.1] - 2022-10-31
|
||||||
## Changed
|
## Changed
|
||||||
|
|||||||
@@ -390,6 +390,7 @@ load_config() {
|
|||||||
AUTO_CLEANUP="no"
|
AUTO_CLEANUP="no"
|
||||||
DEHYDRATED_USER=
|
DEHYDRATED_USER=
|
||||||
DEHYDRATED_GROUP=
|
DEHYDRATED_GROUP=
|
||||||
|
DEHYDRATED_SUDO_ENV="no"
|
||||||
API="auto"
|
API="auto"
|
||||||
|
|
||||||
if [[ -z "${CONFIG:-}" ]]; then
|
if [[ -z "${CONFIG:-}" ]]; then
|
||||||
@@ -442,8 +443,12 @@ load_config() {
|
|||||||
if [[ -z "${DEHYDRATED_GROUP}" ]]; then
|
if [[ -z "${DEHYDRATED_GROUP}" ]]; then
|
||||||
if [[ "${EUID}" != "${TARGET_UID}" ]]; then
|
if [[ "${EUID}" != "${TARGET_UID}" ]]; then
|
||||||
echo "# INFO: Running $0 as ${DEHYDRATED_USER}"
|
echo "# INFO: Running $0 as ${DEHYDRATED_USER}"
|
||||||
|
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[@]}"
|
has_sudo && exec sudo -u "${DEHYDRATED_USER}" "${0}" "${ORIGARGS[@]}"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
TARGET_GID="$(getent group "${DEHYDRATED_GROUP}" | cut -d':' -f3)" || _exiterr "DEHYDRATED_GROUP ${DEHYDRATED_GROUP} is invalid"
|
TARGET_GID="$(getent group "${DEHYDRATED_GROUP}" | cut -d':' -f3)" || _exiterr "DEHYDRATED_GROUP ${DEHYDRATED_GROUP} is invalid"
|
||||||
if [[ -z "${EGID:-}" ]]; then
|
if [[ -z "${EGID:-}" ]]; then
|
||||||
@@ -452,9 +457,13 @@ load_config() {
|
|||||||
fi
|
fi
|
||||||
if [[ "${EUID}" != "${TARGET_UID}" ]] || [[ "${EGID}" != "${TARGET_GID}" ]]; then
|
if [[ "${EUID}" != "${TARGET_UID}" ]] || [[ "${EGID}" != "${TARGET_GID}" ]]; then
|
||||||
echo "# INFO: Running $0 as ${DEHYDRATED_USER}/${DEHYDRATED_GROUP}"
|
echo "# INFO: Running $0 as ${DEHYDRATED_USER}/${DEHYDRATED_GROUP}"
|
||||||
|
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[@]}"
|
has_sudo && exec sudo -u "${DEHYDRATED_USER}" -g "${DEHYDRATED_GROUP}" "${0}" "${ORIGARGS[@]}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
elif [[ -n "${DEHYDRATED_GROUP}" ]]; then
|
elif [[ -n "${DEHYDRATED_GROUP}" ]]; then
|
||||||
_exiterr "DEHYDRATED_GROUP can only be used in combination with DEHYDRATED_USER."
|
_exiterr "DEHYDRATED_GROUP can only be used in combination with DEHYDRATED_USER."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -16,6 +16,9 @@
|
|||||||
# Which group should dehydrated run as? This will be implicitly enforced when running as root
|
# Which group should dehydrated run as? This will be implicitly enforced when running as root
|
||||||
#DEHYDRATED_GROUP=
|
#DEHYDRATED_GROUP=
|
||||||
|
|
||||||
|
# Should dehydrated pass environment variables over sudo?
|
||||||
|
#DEHYDRATED_SUDO_ENV="no"
|
||||||
|
|
||||||
# Resolve names to addresses of IP version only. (curl)
|
# Resolve names to addresses of IP version only. (curl)
|
||||||
# supported values: 4, 6
|
# supported values: 4, 6
|
||||||
# default: <unset>
|
# default: <unset>
|
||||||
|
|||||||
Reference in New Issue
Block a user