Skip to content

Proper ip cleanup when updating ISP IP #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dramirezRT wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Proper ip cleanup when updating ISP IP #86

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
381a255
Proper ip cleanup when updating ISP IP
dramirezRT Dec 4, 2022
dfc8652
Update flux_common.sh
dramirezRT Dec 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion flux_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1695,6 +1695,7 @@ function selfhosting() {
sudo chown $USER:$USER /home/$USER/ip_check.sh
cat <<-'EOF' > /home/$USER/ip_check.sh
#!/bin/bash
USER=$(whoami)

function get_ip(){
WANIP=$(curl --silent -m 10 https://api4.my-ip.io/ip | tr -dc '[:alnum:].')
Expand Down Expand Up @@ -1724,6 +1725,11 @@ function selfhosting() {
if [[ "$device_name" != "" && "$WANIP" != "" ]]; then
date_timestamp=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "New IP detected, IP: $WANIP was added at $date_timestamp" >> /home/$USER/ip_history.log
for i in $(ip --oneline addr show ${device_name} | grep "/32" | awk '{print $4}');
do
[[ $i == "${WANIP}/32" ]] && exit 0
sudo ip addr del $i dev $device_name
done
sudo ip addr add $WANIP dev $device_name && sleep 2
fi
fi
Expand All @@ -1734,11 +1740,19 @@ function selfhosting() {
if [[ "$api_port" == "" ]]; then
api_port="16127"
fi
confirmed_ip=$(curl -SsL -m 10 http://localhost:$api_port/flux/info | jq -r .data.node.status.ip | sed -r 's/:.+//')
confirmed_ip=$(curl -SsL --retry 5 -m 10 http://localhost:$api_port/flux/info | jq -r .data.node.status.ip | sed -r 's/:.+//')
if [[ "$WANIP" != "" && "$confirmed_ip" != "" ]]; then
if [[ "$WANIP" != "$confirmed_ip" ]]; then
current_reg_ip=$(ip --oneline addr show ${device_name} | grep "/32" | awk '{print $4}')
[[ "${WANIP}/32" == "${current_reg_ip}" ]] && exit 0

date_timestamp=$(date '+%Y-%m-%d %H:%M:%S')
echo -e "New IP detected, IP: $WANIP was added at $date_timestamp" >> /home/$USER/ip_history.log
for i in $(ip --oneline addr show ${device_name} | grep "/32" | awk '{print $4}');
do
[[ $i == "${WANIP}/32" ]] && exit 0
sudo ip addr del $i dev $device_name
done
sudo ip addr add $WANIP dev $device_name && sleep 2
fi
fi
Expand Down