kleinere fixes

This commit is contained in:
alcapone1933
2022-10-30 05:46:13 +01:00
parent c1210dba20
commit 5dce3de1f1
3 changed files with 21 additions and 9 deletions

View File

@@ -1,3 +1,3 @@
# Cronjob DDNS Updater ipv64.net # Cronjob DDNS Updater ipv64.net
*/15 * * * * /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1 */15 * * * * /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1
*/30 * * * * sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S` Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1 */30 * * * * sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S` IP CHECK - Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1

View File

@@ -13,7 +13,7 @@ if [ "$IP" == "$UPDIP" ]; then
else else
echo echo
echo "$DATUM UPDATE !!! ..." echo "$DATUM UPDATE !!! ..."
echo "$DATUM UPDATE !!! - Update IP= $IP - Alte-IP: $UPDIP" echo "$DATUM UPDATE !!! - Update IP= $IP - Alte-IP= $UPDIP"
sleep 1 sleep 1
echo "$IP" > $PFAD/updip.txt echo "$IP" > $PFAD/updip.txt
echo echo
@@ -31,20 +31,20 @@ DOMAIN_CHECK=$(dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net)
sleep 1 sleep 1
if [ "$IP" == "$DOMAIN_CHECK" ]; then if [ "$IP" == "$DOMAIN_CHECK" ]; then
echo echo
echo "$DATUM CHECK - DOMAIN HAT DEN IP EINTRAG: `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`" echo "$DATUM CHECK - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
echo echo
else else
echo echo
echo "$DATUM UPDATE !!! ..." echo "$DATUM UPDATE !!! ..."
echo "$DATUM UPDATE !!! - NACHEINTAG DIE IP WIRD NOCH EINMAL GESETZT" echo "$DATUM UPDATE !!! - NACHEINTRAG DIE IP WIRD NOCH EINMAL GESETZT"
echo "$DATUM UPDATE !!! - Update IP= $IP - Alte-IP: $UPDIP" echo "$DATUM UPDATE !!! - Update IP= $IP - Alte-IP= $UPDIP"
sleep 5 sleep 5
echo echo
curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}" curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}"
# curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr> # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>
sleep 15 sleep 15
echo echo
echo "$DATUM NACHEINTAG - DOMAIN HAT DEN IP EINTRAG: `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`" echo "$DATUM NACHEINTRAG - DOMAIN HAT DEN IP EINTRAG= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
echo echo
fi fi
} }

View File

@@ -1,7 +1,17 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# set -x # set -x
set -e set -e
# cleanup
cleanup() {
echo "================================ STOP DDNS UPDATER IPV64.NET ================================"
}
# Trap SIGTERM
trap 'cleanup' SIGTERM
echo -n "" > /var/log/cron.log
sleep 10 sleep 10
echo "================================ START DDNS UPDATER IPV64.NET ================================" echo "================================ START DDNS UPDATER IPV64.NET ================================"
if [ -z "${DOMAIN_KEY:-}" ] ; then if [ -z "${DOMAIN_KEY:-}" ] ; then
@@ -43,7 +53,7 @@ fi
echo "${IP}" > /data/updip.txt echo "${IP}" > /data/updip.txt
curl -sSL --fail https://ipv64.net/ > /dev/null || exit 1 curl -sSL --fail https://ipv64.net/ > /dev/null || exit 1
echo "${CRON_TIME} /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1" > /etc/cron.d/container_cronjob echo "${CRON_TIME} /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1" > /etc/cron.d/container_cronjob
echo "$CRON_TIME_DIG" 'sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S` Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1' >> /etc/cron.d/container_cronjob echo "$CRON_TIME_DIG" 'sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S` IP CHECK - Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1' >> /etc/cron.d/container_cronjob
sleep 2 sleep 2
@@ -51,4 +61,6 @@ sleep 2
/usr/sbin/crond /usr/sbin/crond
set tail -f /var/log/cron.log "$@" set tail -f /var/log/cron.log "$@"
exec "$@" exec "$@" &
wait $!