iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i3 fix, other improvements
[distro-setup]
/
dynamic-ip-update
diff --git
a/dynamic-ip-update
b/dynamic-ip-update
index f4cec4ba53a79261ed2e33e7685f9c68f40b8cc2..3d36363bcfe3cce4e60aa2c1e4ff804d9f9eaad8 100755
(executable)
--- 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 ! 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
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
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
;;
*)
return 0
@@
-116,8
+120,8
@@
main() {
if $athome; then
if $athome; then
- if ! cur4="$(dig +short $dyn
host
@iankelling.org | tail -1)"; then
- if [[
! $INVOCATION_ID
]]; then
+ if ! cur4="$(dig +short $dyn
domain
@iankelling.org | tail -1)"; then
+ if [[
$PPID != 1
]]; then
echo "$0: dig failed. internet looks down. giving up"
fi
return 0
echo "$0: dig failed. internet looks down. giving up"
fi
return 0
@@
-175,10
+179,10
@@
EOF
if $up4; then
cat >>$tmpf <<EOF
if $up4; then
cat >>$tmpf <<EOF
-update delete $dynhost. A
-update add $dynhost. 300 A $ip4
update delete $dyndomain. A
update add $dyndomain. 300 A $ip4
update delete $dyndomain. A
update add $dyndomain. 300 A $ip4
+update delete $dyndomain_internet. A
+update add $dyndomain_internet. 300 A $ip4
EOF
fi
EOF
fi
@@
-220,7
+224,7
@@
loop-main() {
}
nsupdate_fails=0
}
nsupdate_fails=0
-if [[ $
INVOCATION_ID
]]; then
+if [[ $
PPID == 1
]]; then
nsupdate_fail_limit=10
loop-main
else
nsupdate_fail_limit=10
loop-main
else