mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2025-12-12 01:00:29 +08:00
sudo --preserve-env in kvmd-certbot
This commit is contained in:
parent
74785aec88
commit
b816bcb335
@ -74,14 +74,14 @@ function restart_if_running_vnc() {
|
||||
case "$1" in
|
||||
-h|--help|help)
|
||||
create_tmp
|
||||
sudo -u "$user" certbot "$@" "${cur_opts[@]}"
|
||||
sudo --preserve-env -u "$user" certbot "$@" "${cur_opts[@]}"
|
||||
;;
|
||||
|
||||
--)
|
||||
shift
|
||||
create_tmp
|
||||
ensure_runroot
|
||||
sudo -u "$user" kvmd-pstrun -- certbot "$@" "${cur_opts[@]}"
|
||||
sudo --preserve-env -u "$user" kvmd-pstrun -- certbot "$@" "${cur_opts[@]}"
|
||||
;;
|
||||
|
||||
certonly|certonly_webroot)
|
||||
@ -92,7 +92,7 @@ case "$1" in
|
||||
shift
|
||||
create_tmp
|
||||
ensure_runroot
|
||||
sudo -u "$user" kvmd-pstrun -- certbot certonly "$@" "${cur_opts[@]}" \
|
||||
sudo --preserve-env -u "$user" kvmd-pstrun -- certbot certonly "$@" "${cur_opts[@]}" \
|
||||
"${webroot_opts[@]}" \
|
||||
--deploy-hook="/usr/bin/bash -c '
|
||||
set -ex
|
||||
@ -107,13 +107,13 @@ case "$1" in
|
||||
cp -a "$cur"/{config,work,logs} "$tmp"
|
||||
chown -R "$user:" "$tmp"
|
||||
sed -s -i -e "s| = $cur/| = $tmp/|g" "$tmp/config/renewal/"*
|
||||
sudo -u "$user" certbot renew "$@" \
|
||||
sudo --preserve-env -u "$user" certbot renew "$@" \
|
||||
--config-dir="$tmp/config" \
|
||||
--work-dir="$tmp/work" \
|
||||
--logs-dir="$tmp/logs" \
|
||||
--deploy-hook="/usr/bin/touch '$tmp/updated'" || true
|
||||
if [ -f "$tmp/updated" ]; then
|
||||
sudo -u "$user" kvmd-pstrun -- bash -c "
|
||||
sudo --preserve-env -u "$user" kvmd-pstrun -- bash -c "
|
||||
set -ex
|
||||
rm -rf '$new'
|
||||
cp -a '$tmp' '$new'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user