YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Bash script now uses network.py's function for IP detection

Browse source
This commit is contained in:
theo@manjaro 2022-06-29 15:52:44 +02:00
parent 5f2447e454
commit dfeb9e510d
1 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
hooks/conf_regen/43-dnsmasq
View file

@ -6,11 +6,6 @@ set -e
do_pre_regen() { do_pre_regen() {
pending_dir=$1 pending_dir=$1
# split the mirrors URLs
IFS=','
read -raip_yuno<<<$(yunohost settings get security.ipmirrors.v4)
read -raip_yuno6<<<$(yunohost settings get security.ipmirrors.v6)
cd /usr/share/yunohost/conf/dnsmasq cd /usr/share/yunohost/conf/dnsmasq
# create directory for pending conf # create directory for pending conf
@ -29,27 +24,11 @@ do_pre_regen() {
###### IPV4 ####### ###### IPV4 #######
foundip=0 ipv4=$(yunohost tools shell -c "from yunohost.utils.network import get_public_ips;print(get_public_ips(4)[0])")
for link in "${ip_yuno[@]}" ; do
if [ $(curl --connect-timeout 5 -o -I -L -s -w "%{http_code}" "$link" 2> /dev/null) -eq 200 ] && [ $foundip -ne 1 ]; then
ipv4=$(curl -s -4 "$link" 2>/dev/null || true)
ynh_validate_ip4 "$ipv4" || ipv4='127.0.0.1'
foundip=1
fi
done
###### IPV6 ####### ###### IPV6 #######
foundip=0 ipv6=$(yunohost tools shell -c "from yunohost.utils.network import get_public_ips;print(get_public_ips(6)[0])")
for i in "${!ip_yuno6[@]}" ; do
if [ $(curl --connect-timeout 5 -o -I -L -s -w "%{http_code}" "${ip6_yuno[$i]}" 2> /dev/null) -eq 200 ] && [ $foundip -ne 1 ]; then
ipv6=$(curl -s -6 "${ip_yuno6[$i]}" 2>/dev/null || true)
ynh_validate_ip6 "$ipv6" || ipv6=''
foundip=1
fi
done
interfaces="$(ip -j addr show | jq -r '[.[].ifname]|join(" ")')" interfaces="$(ip -j addr show | jq -r '[.[].ifname]|join(" ")')"
wireless_interfaces="lo" wireless_interfaces="lo"