From 704d9f979586e1668af23654e2a4dc2223f2fec0 Mon Sep 17 00:00:00 2001 From: 4s3ti <4s3ti@4s3ti.net> Date: Tue, 29 Nov 2022 00:05:34 +0100 Subject: [PATCH] refactor: Harmonize ownership fix #1608: Use same moethod to define ownership in bot makeOVPN and makeCONF scripts --- scripts/openvpn/makeOVPN.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/openvpn/makeOVPN.sh b/scripts/openvpn/makeOVPN.sh index 811f88e..696e19a 100755 --- a/scripts/openvpn/makeOVPN.sh +++ b/scripts/openvpn/makeOVPN.sh @@ -14,6 +14,10 @@ INDEX="/etc/openvpn/easy-rsa/pki/index.txt" # shellcheck disable=SC1090 source "${setupVars}" + +# shellcheck disable=SC2154 +userGroup="${install_user}:${install_user}" + ## Functions err() { echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2 @@ -286,7 +290,7 @@ done # shellcheck disable=SC2154 if [[ ! -d "${install_home}/ovpns" ]]; then mkdir "${install_home}/ovpns" - chown "${install_user}:${install_user}" "${install_home}/ovpns" + chown "${userGroup}" "${install_home}/ovpns" chmod 0750 "${install_home}/ovpns" fi @@ -456,7 +460,7 @@ if [[ "${iOS}" == 1 ]]; then -name "${NAME}" \ -out "${install_home}/ovpns/${NAME}.ovpn12" - chown "${install_user}:${install_user}" "${install_home}/ovpns/${NAME}.ovpn12" + chown "${userGroup}" "${install_home}/ovpns/${NAME}.ovpn12" chmod 640 "${install_home}/ovpns/${NAME}.ovpn12" printf "========================================================\n"