pick up port from port line if defined, relax digit check for port to 2-5

pull/23/merge 4.2.5-1-08
binhex 4 years ago
parent b7ce500cb8
commit 80dcb446ff

@ -202,12 +202,14 @@ if [[ $VPN_ENABLED == "yes" ]]; then
continue
fi
vpn_remote_port_cut=$(echo "${vpn_remote_line_item}" | cut -d " " -f2 | grep -P -o '^[\d]{4,5}$' || true)
vpn_remote_port_cut=$(cat "${VPN_CONFIG}" | grep -P -o '(?<=^port\s).*' || true)
if [[ -z "${vpn_remote_port_cut}" ]]; then
vpn_remote_port_cut=$(echo "${vpn_remote_line_item}" | cut -d " " -f2 | grep -P -o '^[\d]{2,5}$' || true)
if [[ -z "${vpn_remote_port_cut}" ]]; then
echo "[warn] VPN configuration file ${VPN_CONFIG} remote port is missing or malformed, assuming port '1194'" | ts '%Y-%m-%d %H:%M:%.S'
vpn_remote_port_cut="1194"
fi
fi
vpn_remote_protocol_cut=$(cat "${VPN_CONFIG}" | grep -P -o '(?<=^proto\s).*' || true)
if [[ -z "${vpn_remote_protocol_cut}" ]]; then

Loading…
Cancel
Save