GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

sudo --preserve-env in kvmd-certbot

Browse Source
This commit is contained in:
Maxim Devaev 2022-07-03 17:26:15 +03:00
parent 74785aec88
commit b816bcb335
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/kvmd-certbot
View File

@ -74,14 +74,14 @@ function restart_if_running_vnc() {
case "$1" in case "$1" in
-h|--help|help) -h|--help|help)
create_tmp create_tmp
sudo -u "$user" certbot "$@" "${cur_opts[@]}" sudo --preserve-env -u "$user" certbot "$@" "${cur_opts[@]}"
;; ;;
--) --)
shift shift
create_tmp create_tmp
ensure_runroot ensure_runroot
sudo -u "$user" kvmd-pstrun -- certbot "$@" "${cur_opts[@]}" sudo --preserve-env -u "$user" kvmd-pstrun -- certbot "$@" "${cur_opts[@]}"
;; ;;
certonly|certonly_webroot) certonly|certonly_webroot)
@ -92,7 +92,7 @@ case "$1" in
shift shift
create_tmp create_tmp
ensure_runroot ensure_runroot
sudo -u "$user" kvmd-pstrun -- certbot certonly "$@" "${cur_opts[@]}" \ sudo --preserve-env -u "$user" kvmd-pstrun -- certbot certonly "$@" "${cur_opts[@]}" \
"${webroot_opts[@]}" \ "${webroot_opts[@]}" \
--deploy-hook="/usr/bin/bash -c ' --deploy-hook="/usr/bin/bash -c '
set -ex set -ex
@ -107,13 +107,13 @@ case "$1" in
cp -a "$cur"/{config,work,logs} "$tmp" cp -a "$cur"/{config,work,logs} "$tmp"
chown -R "$user:" "$tmp" chown -R "$user:" "$tmp"
sed -s -i -e "s| = $cur/| = $tmp/|g" "$tmp/config/renewal/"* 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" \ --config-dir="$tmp/config" \
--work-dir="$tmp/work" \ --work-dir="$tmp/work" \
--logs-dir="$tmp/logs" \ --logs-dir="$tmp/logs" \
--deploy-hook="/usr/bin/touch '$tmp/updated'" || true --deploy-hook="/usr/bin/touch '$tmp/updated'" || true
if [ -f "$tmp/updated" ]; then if [ -f "$tmp/updated" ]; then
sudo -u "$user" kvmd-pstrun -- bash -c " sudo --preserve-env -u "$user" kvmd-pstrun -- bash -c "
set -ex set -ex
rm -rf '$new' rm -rf '$new'
cp -a '$tmp' '$new' cp -a '$tmp' '$new'