Update 93-openvpn.sh

This commit is contained in:
Alexandre
2023-12-23 10:47:51 +01:00
committed by GitHub
parent f42359193e
commit 69db5079c8

View File

@@ -14,9 +14,17 @@ if bashio::config.true 'openvpn_enabled'; then
bashio::log.info "Openvpn enabled, configuring" bashio::log.info "Openvpn enabled, configuring"
bashio::log.info "----------------------------" bashio::log.info "----------------------------"
# If openvpn_config not set, but folder is not empty
if [ ! "$(ls -A /config/openvpn/*.ovpn 2>/dev/null)" ]; then
bashio::exit.nok "Configured ovpn file : $openvpn_config not found! Are you sure you added it in /addon_configs/$HOSTNAME/openvpn using the Filebrowser addon ?"
fi
# Get current ip # Get current ip
curl -s ipecho.net/plain > /currentip curl -s ipecho.net/plain > /currentip
# Standardize lf
find /config/openvpn/ -type f -print0 | xargs -0 dos2unix -ic0 | xargs -0 dos2unix -b
##################### #####################
# CONFIGURE OPENVPN # # CONFIGURE OPENVPN #
##################### #####################
@@ -37,13 +45,10 @@ if bashio::config.true 'openvpn_enabled'; then
else else
bashio::exit.nok "Configured ovpn file : $openvpn_config is set but does not end by .ovpn ; it can't be used!" bashio::exit.nok "Configured ovpn file : $openvpn_config is set but does not end by .ovpn ; it can't be used!"
fi fi
# File not found
else
bashio::exit.nok "Configured ovpn file : $openvpn_config not found! Are you sure you added it in /addon_configs/$HOSTNAME/openvpn using the Filebrowser addon ?"
fi fi
# If openvpn_config not set, but folder is not empty # If openvpn_config not set, but folder is not empty
elif [ "$(ls -A /config/openvpn/*.ovpn 2>/dev/null)" ]; then else
# Look for openvpn files # Look for openvpn files
# Wildcard search for openvpn config files and store results in array # Wildcard search for openvpn config files and store results in array
mapfile -t VPN_CONFIGS < <( find /config/openvpn -maxdepth 1 -name "*.ovpn" -print ) mapfile -t VPN_CONFIGS < <( find /config/openvpn -maxdepth 1 -name "*.ovpn" -print )
@@ -56,10 +61,6 @@ if bashio::config.true 'openvpn_enabled'; then
cp /config/openvpn/* /etc/openvpn/ cp /config/openvpn/* /etc/openvpn/
# Standardize file # Standardize file
cp /config/openvpn/"${openvpn_config}" /etc/openvpn/config.ovpn cp /config/openvpn/"${openvpn_config}" /etc/openvpn/config.ovpn
# If openvpn_config not set, and folder is empty
else
bashio::exit.nok "Openvpn enabled, but no .ovpn files in the /addon_configs/$HOSTNAME/openvpn folder ! Exiting"
fi fi
# Correct paths # Correct paths