Merge pull request 'development' (#4) from development into master

2026-02-06 04:28:50 +01:00 · 2022-11-29 17:02:53 +01:00
parent 776eb3ac8d 0ce80be3dc
commit e77043a427
8 changed files with 174 additions and 19 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -37,7 +37,7 @@ steps:
      repo: alcapone1933/ddns-ipv64
      # tags: latest
      auto_tag: true
-      auto_tag_suffix: v0.0.7
+      auto_tag_suffix: v0.0.8

 trigger:
  branch:
@@ -68,7 +68,7 @@ steps:
      repo: ghcr.io/alcapone1933/ddns-ipv64
      # tags: latest
      auto_tag: true
-      auto_tag_suffix: v0.0.7
+      auto_tag_suffix: v0.0.8

 trigger:
  branch:
--- a/8
+++ b/8
@@ -4,7 +4,7 @@ LABEL maintainer="alcapone1933 <alcapone1933@cosanostra-cloud.de>" \
      org.opencontainers.image.created="$(date +%Y-%m-%d\ %H:%M)" \
      org.opencontainers.image.authors="alcapone1933 <alcapone1933@cosanostra-cloud.de>" \
      org.opencontainers.image.url="https://hub.docker.com/r/alcapone1933/ddns-ipv64" \
-      org.opencontainers.image.version="v0.0.7" \
+      org.opencontainers.image.version="v0.0.8" \
      org.opencontainers.image.ref.name="alcapone1933/ddns-ipv64" \
      org.opencontainers.image.title="DDNS Updater ipv64.net" \
      org.opencontainers.image.description="Community DDNS Updater fuer ipv64.net"
@@ -12,7 +12,7 @@ LABEL maintainer="alcapone1933 <alcapone1933@cosanostra-cloud.de>" \
 ENV TZ=Europe/Berlin
 ENV CRON_TIME="*/15 * * * *"
 ENV CRON_TIME_DIG="*/30 * * * *"
-ENV VERSION="v0.0.7"
+ENV VERSION="v0.0.8"
 ENV CURL_USER_AGENT="docker-ddns-ipv64/version=$VERSION github.com/alcapone1933/docker-ddns-ipv64"
 RUN apk add --update --no-cache tzdata curl bash tini bind-tools jq && \
    rm -rf /var/cache/apk/*
@@ -21,8 +21,8 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN mkdir -p /data /usr/local/bin/ /etc/cron.d/
 COPY data /data
 RUN mv /data/entrypoint.sh /usr/local/bin/entrypoint.sh && mv /data/cronjob /etc/cron.d/container_cronjob && mv /data/healthcheck.sh /usr/local/bin/healthcheck.sh  && \
-    chmod 755 /data/ddns-update.sh && chmod 755 /data/ddns-update-praefix.sh && chmod 755 /usr/local/bin/entrypoint.sh && chmod 755 /usr/local/bin/healthcheck.sh && \
-    chmod 755 /etc/cron.d/container_cronjob && touch /var/log/cron.log
+    chmod 755 /data/ddns-update.sh && chmod 755 /data/ddns-update-praefix.sh && chmod 755 /data/ddns-update-dkey.sh && chmod 755 /data/ddns-update-dkey-praefix.sh && \
+    chmod 755 /usr/local/bin/entrypoint.sh && chmod 755 /usr/local/bin/healthcheck.sh && chmod 755 /etc/cron.d/container_cronjob && touch /var/log/cron.log
 # VOLUME [ "/data" ]

 ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"]
--- a/data/ddns-update-dkey-praefix.sh
+++ b/data/ddns-update-dkey-praefix.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+DATUM=$(date +%Y-%m-%d\ %H:%M:%S)
+if ! curl -sSL --user-agent "${CURL_USER_AGENT}" --fail "https://ipv64.net" > /dev/null; then
+    echo "$DATUM  FEHLER !!!  - 404 Sie haben kein Netzwerk oder Internetzugang oder die Webseite ipv64.net ist nicht erreichbar"
+	exit 0
+fi
+PFAD="/data"
+IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?howismyip" | jq -r 'to_entries[] | "\(.value)"')
+UPDIP=$(cat $PFAD/updip.txt)
+
+sleep 1
+
+if [ "$IP" == "$UPDIP" ]; then
+    echo "$DATUM  KEIN UPDATE - Aktuelle IP=$UPDIP"
+else
+    echo "$DATUM  UPDATE !!! ..."
+    echo "$DATUM  UPDATE !!!  - Update IP=$IP - Alte-IP=$UPDIP"
+    sleep 1
+    echo "$IP" > $PFAD/updip.txt
+    # curl -4sSL "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=${IP}&output=min"
+    UPDATE_IP=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=${IP}&output=min")
+    # if [ "$UPDATE_IP" = "ok" ] ; then
+    if [[ "$UPDATE_IP" =~ (nochg|good|ok) ]] ; then
+        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP AN IPV64.NET GESENDET"
+    else
+        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP NICHT GESENTET"
+    fi
+    # curl -4sSL https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=<ipaddr>&ip6=<ip6addr>&output=min
+fi
+sleep 5
+# Nachpruefung ob der DOMAIN Eintrag richtig gesetzt ist
+function CHECK_A_DOMAIN() {
+DATUM=$(date +%Y-%m-%d\ %H:%M:%S)
+UPDIP=$(cat $PFAD/updip.txt)
+# IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1)
+IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?howismyip" | jq -r 'to_entries[] | "\(.value)"')
+DOMAIN_CHECK=$(dig +short ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net)
+sleep 1
+if [ "$IP" == "$DOMAIN_CHECK" ]; then
+    echo "$DATUM  CHECK       - DOMAIN mit PRAEFIX HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net`"
+else
+    echo "$DATUM  UPDATE !!! ..."
+    echo "$DATUM  UPDATE !!!  - NACHEINTRAG DIE IP WIRD NOCH EINMAL GESETZT"
+    echo "$DATUM  UPDATE !!!  - Update IP=$IP - Alte-IP=$UPDIP"
+    sleep 5
+    # curl -4sSL "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=${IP}&output=min"
+    UPDATE_IP=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=${IP}&output=min")
+    # if [ "$UPDATE_IP" = "ok" ] ; then
+    if [[ "$UPDATE_IP" =~ (nochg|good|ok) ]] ; then
+        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP AN IPV64.NET GESENDET"
+    else
+        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP NICHT GESENTET"
+    fi
+    # curl -4sSL https://ipv64.net/update.php?dkey=${DOMAIN_KEY}=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=<ipaddr>&ip6=<ip6addr>&output=min
+    sleep 15
+    echo "$DATUM  NACHEINTRAG - DOMAIN mit PRAEFIX HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net`"
+fi
+}
+CHECK_A_DOMAIN
--- a/data/ddns-update-dkey.sh
+++ b/data/ddns-update-dkey.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+DATUM=$(date +%Y-%m-%d\ %H:%M:%S)
+if ! curl -sSL --user-agent "${CURL_USER_AGENT}" --fail "https://ipv64.net" > /dev/null; then
+    echo "$DATUM  FEHLER !!!  - 404 Sie haben kein Netzwerk oder Internetzugang oder die Webseite ipv64.net ist nicht erreichbar"
+	exit 0
+fi
+PFAD="/data"
+# IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1)
+IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?howismyip" | jq -r 'to_entries[] | "\(.value)"')
+UPDIP=$(cat $PFAD/updip.txt)
+
+sleep 1
+
+if [ "$IP" == "$UPDIP" ]; then
+    echo "$DATUM  KEIN UPDATE - Aktuelle IP=$UPDIP"
+else
+    echo "$DATUM  UPDATE !!! ..."
+    echo "$DATUM  UPDATE !!!  - Update IP=$IP - Alte-IP=$UPDIP"
+    sleep 1
+    echo "$IP" > $PFAD/updip.txt
+    # curl -4sSL "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min"
+    UPDATE_IP=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min")
+    # if [ "$UPDATE_IP" = "ok" ] ; then
+    if [[ "$UPDATE_IP" =~ (nochg|good|ok) ]] ; then
+        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP AN IPV64.NET GESENDET"
+    else
+        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP NICHT GESENTET"
+    fi
+    # curl -4sSL https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min
+fi
+sleep 5
+# Nachpruefung ob der DOMAIN Eintrag richtig gesetzt ist
+function CHECK_A_DOMAIN() {
+DATUM=$(date +%Y-%m-%d\ %H:%M:%S)
+UPDIP=$(cat $PFAD/updip.txt)
+# IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1)
+IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?howismyip" | jq -r 'to_entries[] | "\(.value)"')
+DOMAIN_CHECK=$(dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net)
+sleep 1
+if [ "$IP" == "$DOMAIN_CHECK" ]; then
+    echo "$DATUM  CHECK       - DOMAIN HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
+else
+    echo "$DATUM  UPDATE !!! ..."
+    echo "$DATUM  UPDATE !!!  - NACHEINTRAG DIE IP WIRD NOCH EINMAL GESETZT"
+    echo "$DATUM  UPDATE !!!  - Update IP=$IP - Alte-IP=$UPDIP"
+    sleep 5
+    # curl -4sSL "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min"
+    UPDATE_IP=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min")
+    # if [ "$UPDATE_IP" = "ok" ] ; then
+    if [[ "$UPDATE_IP" =~ (nochg|good|ok) ]] ; then
+        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP AN IPV64.NET GESENDET"
+    else
+        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP NICHT GESENTET"
+    fi
+    # curl -4sSL https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min
+    sleep 15
+    echo "$DATUM  NACHEINTRAG - DOMAIN HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
+fi
+}
+CHECK_A_DOMAIN
--- a/data/ddns-update-praefix.sh
+++ b/data/ddns-update-praefix.sh
@@ -25,7 +25,7 @@ else
    else
        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP NICHT GESENTET"
    fi
-    # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&praefix=${DOMAIN_PRAEFIX}&ip=<ipaddr>&ip6=<ip6addr>&output=min
+    # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}praefix=${DOMAIN_PRAEFIX}&ip=<ipaddr>&ip6=<ip6addr>&output=min
 fi
 sleep 5
 # Nachpruefung ob der DOMAIN Eintrag richtig gesetzt ist
@@ -38,7 +38,7 @@ IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?
 DOMAIN_CHECK=$(for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do dig +short ${DOMAIN_PRAEFIX}.${DOMAIN} A @ns1.ipv64.net; done | tail -n 1)
 sleep 1
 if [ "$IP" == "$DOMAIN_CHECK" ]; then
-    # echo "$DATUM  CHECK       - DOMAIN mit PRAEFIX HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net`"
+    # echo "$DATUM  CHECK       - DOMAIN mit PRAEFIX HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net`"
    for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM  CHECK       - DOMAIN mit PRAEFIX HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_PRAEFIX}.${DOMAIN} A @ns1.ipv64.net`"; done
 else
    echo "$DATUM  UPDATE !!! ..."
@@ -53,9 +53,9 @@ else
    else
        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP NICHT GESENTET"
    fi
-    # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=<ipaddr>&ip6=<ip6addr>&output=min
+    # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=<ipaddr>&ip6=<ip6addr>&output=min
    sleep 15
-    # echo "$DATUM  NACHEINTRAG - DOMAIN mit PRAEFIX HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net`"
+    # echo "$DATUM  NACHEINTRAG - DOMAIN mit PRAEFIX HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net`"
    for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM  NACHEINTRAG - DOMAIN mit PRAEFIX HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_PRAEFIX}.${DOMAIN} A @ns1.ipv64.net`"; done
 fi
 }
--- a/data/ddns-update.sh
+++ b/data/ddns-update.sh
@@ -26,7 +26,7 @@ else
    else
        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP NICHT GESENTET"
    fi
-    # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min
+    # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min
 fi
 sleep 5
 # Nachpruefung ob der DOMAIN Eintrag richtig gesetzt ist
@@ -39,7 +39,7 @@ IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?
 DOMAIN_CHECK=$(for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do dig +short ${DOMAIN} A @ns1.ipv64.net; done | tail -n 1)
 sleep 1
 if [ "$IP" == "$DOMAIN_CHECK" ]; then
-    # echo "$DATUM  CHECK       - DOMAIN HAT DEN A-RECORD= `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`"
    for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM  CHECK       - DOMAIN HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN} A @ns1.ipv64.net`"; done
 else
    echo "$DATUM  UPDATE !!! ..."
@@ -54,9 +54,9 @@ else
    else
        echo "$DATUM  UPDATE !!!  - UPDATE IP=$IP NICHT GESENTET"
    fi
-    # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min
+    # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min
    sleep 15
-    # echo "$DATUM  NACHEINTRAG - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
+    # echo "$DATUM  NACHEINTRAG - DOMAIN HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
    for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM  NACHEINTRAG - DOMAIN HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN} A @ns1.ipv64.net`"; done
 fi
 }
--- a/data/entrypoint.sh
+++ b/data/entrypoint.sh
@@ -73,7 +73,6 @@ echo "$CRON_TIME_DIG" 'sleep 20 && for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed

 function Domain_mit_praefix() {
 CHECK=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=${IP}&output=min")
-# if [ "$CHECK" = "ok" ] ; then
 if [[ "$CHECK" =~ (nochg|good|ok) ]] ; then
    echo "$DATUM  CHECK       - Die Angaben sind richtig gesetzt: DOMAIN mit PRAEFIX und DOMAIN KEY"
    sleep 5
@@ -86,10 +85,46 @@ echo "${CRON_TIME} /bin/bash /data/ddns-update-praefix.sh >> /var/log/cron.log 2
 echo "$CRON_TIME_DIG" 'sleep 20 && for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "`date +%Y-%m-%d\ %H:%M:%S`  IP CHECK    - Deine DOMAIN mit PRAEFIX ${DOMAIN_PRAEFIX}.${DOMAIN} HAT DIE IP=`dig +short ${DOMAIN_PRAEFIX}.${DOMAIN} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1; done' >> /etc/cron.d/container_cronjob
 }

-if [[ "$DOMAIN_PRAEFIX_YES" =~ (YES|yes|Yes) ]] ; then
-    Domain_mit_praefix
+function Domain_dkey() {
+CHECK=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min")
+if [[ "$CHECK" =~ (nochg|good|ok) ]] ; then
+    echo "$DATUM  CHECK       - Die Angaben sind richtig gesetzt: DOMAIN und DOMAIN KEY"
+    sleep 5
+    echo "$DATUM  IP CHECK    - Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`"
 else
-    Domain_default
+    echo "$DATUM  FEHLER !!!  - Die Angaben sind falsch  gesetzt: DOMAIN oder DOMAIN KEY"
+    exit 1
+fi
+echo "${CRON_TIME} /bin/bash /data/ddns-update-dkey.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`  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
+}
+
+function Domain_dkey_mit_praefix() {
+CHECK=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?dkey=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&praefix=${DOMAIN_PRAEFIX}&ip=${IP}&output=min")
+if [[ "$CHECK" =~ (nochg|good|ok) ]] ; then
+    echo "$DATUM  CHECK       - Die Angaben sind richtig gesetzt: DOMAIN mit PRAEFIX und DOMAIN KEY"
+    sleep 5
+    echo "$DATUM  IP CHECK    - Deine DOMAIN mit PRAEFIX ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net`"
+else
+    echo "$DATUM  FEHLER !!!  - Die Angaben sind falsch  gesetzt: DOMAIN mit PRAEFIX oder DOMAIN KEY"
+    exit 1
+fi
+echo "${CRON_TIME} /bin/bash /data/ddns-update-dkey-praefix.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`  IP CHECK    - Deine DOMAIN mit PRAEFIX ${DOMAIN_PRAEFIX}.${DOMAIN} HAT DIE IP=`dig +short ${DOMAIN_PRAEFIX}.${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1' >> /etc/cron.d/container_cronjob
+}
+
+if [[ "$DOMAIN_KEY_TYPE" =~ (dkey|DKEY|Dkey) ]] ; then
+    if [[ "$DOMAIN_PRAEFIX_YES" =~ (YES|yes|Yes) ]] ; then
+        Domain_dkey_mit_praefix
+    else
+        Domain_dkey
+    fi
+else
+    if [[ "$DOMAIN_PRAEFIX_YES" =~ (YES|yes|Yes) ]] ; then
+        Domain_mit_praefix
+    else
+        Domain_default
+    fi
 fi

 echo "${IP}" > /data/updip.txt
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
    # build:
      # dockerfile: ./Dockerfile
    image: alcapone1933/ddns-ipv64:latest
-    # image: alcapone1933/ddns-ipv64:v0.0.7
+    # image: alcapone1933/ddns-ipv64:v0.0.8
    container_name: ddns-ipv64
    restart: always
    # volumes:
@@ -21,6 +21,7 @@ services:
      # ⚠️ Nur ein Praefix verwenden ⚠️
      # - "DOMAIN_PRAEFIX=ddns"
      - "DOMAIN_KEY=1234567890abcdefghijklmn"
+      # - "DOMAIN_KEY_TYPE=dkey"
 # volumes:
  # data:
    # name: ddns-ipv64_data