mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-28 18:26:04 +02:00
Update 93-openvpn.sh
This commit is contained in:
@@ -39,7 +39,7 @@ if bashio::config.true 'openvpn_enabled'; then
|
|||||||
# Extract the txt file name from the line
|
# Extract the txt file name from the line
|
||||||
file_name="$(echo "$line" | awk -F' ' '{print $2}')"
|
file_name="$(echo "$line" | awk -F' ' '{print $2}')"
|
||||||
# Check if the txt file exists
|
# Check if the txt file exists
|
||||||
if [ ! -f "$file_name" ]; then
|
if [[ "$file_name" != *"/etc/openvpn/credentials"* ]] && [ ! -f "$file_name" ]; then
|
||||||
# Check if the txt file exists in the /config/openvpn/ directory
|
# Check if the txt file exists in the /config/openvpn/ directory
|
||||||
if [ -f "/config/openvpn/${file_name##*/}" ]; then
|
if [ -f "/config/openvpn/${file_name##*/}" ]; then
|
||||||
# Append /config/openvpn/ in front of the original txt file in the ovpn file
|
# Append /config/openvpn/ in front of the original txt file in the ovpn file
|
||||||
@@ -137,7 +137,7 @@ if bashio::config.true 'openvpn_enabled'; then
|
|||||||
file_name="${file_name:-null}"
|
file_name="${file_name:-null}"
|
||||||
if grep -q ^auth-user-pass /config/openvpn/"$openvpn_config" ; then
|
if grep -q ^auth-user-pass /config/openvpn/"$openvpn_config" ; then
|
||||||
# Credentials specified are they custom ?
|
# Credentials specified are they custom ?
|
||||||
if [[ "$file_name" != *"/etc/openvpn/credentials"* ]] && [[ "$file_name" != "null" ]]; then
|
if [[ "$file_name" != *"/etc/openvpn/credentials"* ]] && [[ "$file_name" != "null" ]]; then
|
||||||
if [ -f "$file_name" ]; then
|
if [ -f "$file_name" ]; then
|
||||||
# If credential specified, exists, and is not the addon default
|
# If credential specified, exists, and is not the addon default
|
||||||
bashio::log.warning "auth-user-pass specified in the ovpn file, addon username and passwords won't be used !"
|
bashio::log.warning "auth-user-pass specified in the ovpn file, addon username and passwords won't be used !"
|
||||||
|
|||||||
Reference in New Issue
Block a user