From b6243b7e2269c62ea609dd1f7128c249cb3ab4d1 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Tue, 20 May 2025 11:23:32 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?=
 =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rootfs/usr/local/etc/docker/init.d/02-named.sh
---
 rootfs/usr/local/etc/docker/init.d/02-named.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/rootfs/usr/local/etc/docker/init.d/02-named.sh b/rootfs/usr/local/etc/docker/init.d/02-named.sh
index 2fc4317..55bc886 100755
--- a/rootfs/usr/local/etc/docker/init.d/02-named.sh
+++ b/rootfs/usr/local/etc/docker/init.d/02-named.sh
@@ -363,10 +363,11 @@ EOF
 
   if [ -d "$VAR_DIR/remote" ]; then
     for dns_file in "$DATA_DIR/remote"/*; do
-      domain_name="${dns_name%.*}"
       file_name="$(basename "$dns_file")"
+      domain_name="$(basename "${dns_file%.*}")"
       main_server="$(grep -sh 'masters ' "$dns_file" | sed 's/^[ \t]*//' || echo "masters { $DNS_REMOTE_SERVER:-$DNS_SERVER_PRIMARY"); };"
-      cat <<EOF | sed 's|masters /d' >>"$TMP_DIR/$file_name"
+      if [ -n "$domain_name" ]; then
+        cat <<EOF | sed 's|masters /d' >>"$TMP_DIR/$file_name"
 #  ********** begin $domain_name **********
 zone "$domain_name" {
     type slave;
@@ -377,13 +378,16 @@ zone "$domain_name" {
 
 EOF
 
-      if named-checkzone -q $domain_name "$TMP_DIR/$file_name"; then
-        cat "$TMP_DIR/$file_name" >>"$DNS_ZONE_FILE"
-        echo "Added $domain_name to $DNS_ZONE_FILE" | tee -a "$LOG_DIR/init.txt"
+        if named-checkzone -q $domain_name "$TMP_DIR/$file_name"; then
+          cat "$TMP_DIR/$file_name" >>"$DNS_ZONE_FILE"
+        else
+          echo "Checking $domain_name has failed" | tee -a "$LOG_DIR/init.txt" >&2
+        fi
+        rm "$TMP_DIR/$file_name"
+        grep -qs "$domain_name" "$DNS_ZONE_FILE" && echo "Secondary $domain_name to $DNS_ZONE_FILE"
       else
-        echo "Checking $domain_name has failed" | tee -a "$LOG_DIR/init.txt" >&2
+        echo "Failed to get domain name from $dns_file" | tee -a "$LOG_DIR/init.txt" >&2
       fi
-      rm "$TMP_DIR/$file_name"
     done
   fi
   [ "$NAMED_CONFIG_COPY" = "yes" ] && cp -Rf "$NAMED_CONFIG_FILE" "$ETC_DIR/named.conf" || cp -Rf "$NAMED_CONFIG_FILE" "$CONF_DIR/named.conf"