YunoHost-Apps/adguardhome_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/adguardhome_ynh.git synced 2024-09-03 18:06:23 +02:00
Code Issues Activity Actions

fix when the server doesn't have an ipv4/6

Browse source
This commit is contained in:
Kay0u 2022-01-06 11:23:20 +01:00
parent 45223b9375
commit bb07a32b64
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
3 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/actions/reset_default_config
View file

@ -28,8 +28,8 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
port=$(ynh_app_setting_get --app=$app --key=port) port=$(ynh_app_setting_get --app=$app --key=port)
adguard_port=$(ynh_app_setting_get --app=$app --key=adguard_port) adguard_port=$(ynh_app_setting_get --app=$app --key=adguard_port)
ipv4_route_output=$(ip -4 route get 1.2.3.4 | head -n1) ipv4_route_output=$(ip -4 route get 1.2.3.4 2> /dev/null || true | head -n1)
ipv6_route_output=$(ip -6 route get ::1.2.3.4 | head -n1) ipv6_route_output=$(ip -6 route get ::1.2.3.4 2> /dev/null || true | head -n1)
ipv4_addr="" ipv4_addr=""
for i in $(seq "$(echo $ipv4_route_output | wc -w)" -1 1); do for i in $(seq "$(echo $ipv4_route_output | wc -w)" -1 1); do

22
scripts/install
View file

@ -116,12 +116,22 @@ ynh_add_nginx_config
#================================================= #=================================================
ynh_script_progression --message="Modifying a config file..." --weight=1 ynh_script_progression --message="Modifying a config file..." --weight=1
ipv4_interface=$(ip route get 1.2.3.4 | grep -oP '(?<=dev )\w+') ipv4_interface=$(ip route get 1.2.3.4 2> /dev/null || true | head -n1 | grep -oP '(?<=dev )\w+')
ipv6_interface=$(ip -6 route get ::1.2.3.4 | grep -oP '(?<=dev )\w+') ipv6_interface=$(ip -6 route get ::1.2.3.4 2> /dev/null || true | head -n1 | grep -oP '(?<=dev )\w+')
if [ "$ipv4_interface" != "$ipv6_interface" ]; then if [ -z "$ipv4_interface" ] && [ -z "$ipv6_interface" ]; then
echo "bind-interfaces ynh_die --message="Impossible to find the main network interface, please report this issue."
elif [ "$ipv4_interface" != "$ipv6_interface" ]; then
if [ -z "$ipv4_interface" ]; then
echo "bind-interfaces
except-interface=$ipv6_interface" > "/etc/dnsmasq.d/$app"
elif [ -z "$ipv6_interface" ]; then
echo "bind-interfaces
except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app"
else
echo "bind-interfaces
except-interface=$ipv4_interface, $ipv6_interface" > "/etc/dnsmasq.d/$app" except-interface=$ipv4_interface, $ipv6_interface" > "/etc/dnsmasq.d/$app"
fi
else else
echo "bind-interfaces echo "bind-interfaces
except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app"
@ -131,8 +141,8 @@ systemctl restart dnsmasq
ynh_store_file_checksum --file="/etc/dnsmasq.d/$app" ynh_store_file_checksum --file="/etc/dnsmasq.d/$app"
ipv4_route_output=$(ip -4 route get 1.2.3.4 | head -n1) ipv4_route_output=$(ip -4 route get 1.2.3.4 2> /dev/null || true | head -n1)
ipv6_route_output=$(ip -6 route get ::1.2.3.4 | head -n1) ipv6_route_output=$(ip -6 route get ::1.2.3.4 2> /dev/null || true | head -n1)
ipv4_addr="" ipv4_addr=""
for i in $(seq "$(echo $ipv4_route_output | wc -w)" -1 1); do for i in $(seq "$(echo $ipv4_route_output | wc -w)" -1 1); do

28
scripts/upgrade
View file

@ -121,12 +121,22 @@ ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
ynh_script_progression --message="Updating a configuration file..." --weight=1 ynh_script_progression --message="Updating a configuration file..." --weight=1
ipv4_interface=$(ip route get 1.2.3.4 | grep -oP '(?<=dev )\w+') ipv4_interface=$(ip route get 1.2.3.4 2> /dev/null || true | head -n1 | grep -oP '(?<=dev )\w+')
ipv6_interface=$(ip -6 route get ::1.2.3.4 | grep -oP '(?<=dev )\w+') ipv6_interface=$(ip -6 route get ::1.2.3.4 2> /dev/null || true | head -n1 | grep -oP '(?<=dev )\w+')
if [ "$ipv4_interface" != "$ipv6_interface" ]; then if [ -z "$ipv4_interface" ] && [ -z "$ipv6_interface" ]; then
echo "bind-interfaces ynh_die --message="Impossible to find the main network interface, please report this issue."
elif [ "$ipv4_interface" != "$ipv6_interface" ]; then
if [ -z "$ipv4_interface" ]; then
echo "bind-interfaces
except-interface=$ipv6_interface" > "/etc/dnsmasq.d/$app"
elif [ -z "$ipv6_interface" ]; then
echo "bind-interfaces
except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app"
else
echo "bind-interfaces
except-interface=$ipv4_interface, $ipv6_interface" > "/etc/dnsmasq.d/$app" except-interface=$ipv4_interface, $ipv6_interface" > "/etc/dnsmasq.d/$app"
fi
else else
echo "bind-interfaces echo "bind-interfaces
except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app" except-interface=$ipv4_interface" > "/etc/dnsmasq.d/$app"
@ -136,8 +146,8 @@ systemctl restart dnsmasq
ynh_store_file_checksum --file="/etc/dnsmasq.d/$app" ynh_store_file_checksum --file="/etc/dnsmasq.d/$app"
ipv4_route_output=$(ip -4 route get 1.2.3.4 | head -n1) ipv4_route_output=$(ip -4 route get 1.2.3.4 2> /dev/null || true | head -n1)
ipv6_route_output=$(ip -6 route get ::1.2.3.4 | head -n1) ipv6_route_output=$(ip -6 route get ::1.2.3.4 2> /dev/null || true | head -n1)
ipv4_addr="" ipv4_addr=""
for i in $(seq "$(echo $ipv4_route_output | wc -w)" -1 1); do for i in $(seq "$(echo $ipv4_route_output | wc -w)" -1 1); do
@ -165,7 +175,11 @@ with open(\"$final_path/AdGuardHome.yaml\", 'r') as file:
need_file_update = False need_file_update = False
if \"0.0.0.0\" in conf_file[\"dns\"][\"bind_hosts\"]: if \"0.0.0.0\" in conf_file[\"dns\"][\"bind_hosts\"]:
conf_file[\"dns\"][\"bind_hosts\"] = [\"$ipv4_addr\", \"$ipv6_addr\"] conf_file[\"dns\"][\"bind_hosts\"] = []
if \"$ipv4_addr\":
conf_file[\"dns\"][\"bind_hosts\"].append(\"$ipv4_addr\")
if \"$ipv6_addr\":
conf_file[\"dns\"][\"bind_hosts\"].append(\"$ipv6_addr\")
need_file_update = True need_file_update = True
if conf_file[\"dns\"][\"port\"] != $adguard_port: if conf_file[\"dns\"][\"port\"] != $adguard_port: