From 4aacfbca5fa14878c06ad18d11d9267ed9225030 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Tue, 27 Aug 2024 10:42:07 -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/tmp/etc/bind/named.conf
rootfs/usr/local/etc/docker/init.d/00-named.sh
---
 rootfs/tmp/etc/bind/named.conf                 | 3 ++-
 rootfs/usr/local/etc/docker/init.d/00-named.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rootfs/tmp/etc/bind/named.conf b/rootfs/tmp/etc/bind/named.conf
index e2b2982..9862283 100644
--- a/rootfs/tmp/etc/bind/named.conf
+++ b/rootfs/tmp/etc/bind/named.conf
@@ -84,4 +84,5 @@ zone "." {
     file "REPLACE_VAR_DIR/root.cache";
 };
 #  ********** end root info **********
-# end
+#####################################################################
+# begin imports
diff --git a/rootfs/usr/local/etc/docker/init.d/00-named.sh b/rootfs/usr/local/etc/docker/init.d/00-named.sh
index 06f0412..8a9052f 100755
--- a/rootfs/usr/local/etc/docker/init.d/00-named.sh
+++ b/rootfs/usr/local/etc/docker/init.d/00-named.sh
@@ -157,11 +157,11 @@ user_pass="${NAMED_USER_PASS_WORD:-}" # normal user password
 [ -f "/config/env/named.sh" ] && . "/config/env/named.sh"               # Overwrite the variabes
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Additional predefined variables
+DNS_SERIAL="$(date +'%Y%m%d%S')"
 KEY_RNDC="${KEY_RNDC:-$(__rndc_key || __tsig_key)}"
 KEY_DHCP="${KEY_DHCP:-$(__dhcp_key || __tsig_key)}"
 KEY_BACKUP="${KEY_BACKUP:-$(__backup_key || __tsig_key)}"
 KEY_CERTBOT="${KEY_CERTBOT:-$(__certbot_key || __tsig_key)}"
-DNS_SERIAL="$(date +'%Y%m%d%S')"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Additional variables
 DNS_TYPE="${DNS_TYPE:-primary}"
@@ -277,7 +277,7 @@ __pre_execute() {
   if [ $zone_files = 0 ] && [ ! -f "$DATA_DIR/zones/$HOSTNAME.zone" ]; then
     cat <<EOF | tee "$DATA_DIR/zones/$HOSTNAME.zone" &>/dev/null
 ; config for $HOSTNAME
-@                         IN  SOA     $HOSTNAME. root.$HOSTNAME. ( $serial 10800 3600 1209600 38400)
+@                         IN  SOA     $HOSTNAME. root.$HOSTNAME. ( $DNS_SERIAL 10800 3600 1209600 38400)
                           IN  NS      $HOSTNAME.
 $HOSTNAME.                IN  A       $CONTAINER_IP4_ADDRESS