X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=dynamic-ip-update;h=3d36363bcfe3cce4e60aa2c1e4ff804d9f9eaad8;hb=989554cab0d0c59d1aab20496ba9550acd17e6e6;hp=f4cec4ba53a79261ed2e33e7685f9c68f40b8cc2;hpb=50f25d1eec109c4596cfc638c9a7c98da0f0b5d0;p=distro-setup diff --git a/dynamic-ip-update b/dynamic-ip-update index f4cec4b..3d36363 100755 --- a/dynamic-ip-update +++ b/dynamic-ip-update @@ -76,7 +76,7 @@ main() { if ! tmp=$(ip -4 route get 85.119.83.50 2>/dev/null); then # our internet is down - if [[ $INVOCATION_ID ]]; then + if [[ $PPID == 1 ]]; then return 0 else echo $0: failed to get route, giving up @@ -88,7 +88,11 @@ main() { case $gateway in 10.2.0.1) dyndomain=b8.nz - dynhost=i.b8.nz + # This domain is for any case where we want some different + # configuration based on lan vs wan. For right now, the only use + # is for ssh config to use port forwarding ports on the wan + # domain. + dyndomain_internet=i.b8.nz ;; *) return 0 @@ -116,8 +120,8 @@ main() { if $athome; then - if ! cur4="$(dig +short $dynhost @iankelling.org | tail -1)"; then - if [[ ! $INVOCATION_ID ]]; then + if ! cur4="$(dig +short $dyndomain @iankelling.org | tail -1)"; then + if [[ $PPID != 1 ]]; then echo "$0: dig failed. internet looks down. giving up" fi return 0 @@ -175,10 +179,10 @@ EOF if $up4; then cat >>$tmpf <