From 2a8789e554a28a8db58f3ec9f8579234ed50fa05 Mon Sep 17 00:00:00 2001
From: Kameron Kenny <1267885+kkenny@users.noreply.github.com>
Date: Thu, 27 Jun 2024 20:25:32 -0400
Subject: [PATCH] recurse for local

---
 Dockerfile.primary            |  2 +-
 Dockerfile.secondary          |  2 +-
 docker-compose.yml            |  4 ++--
 primary/etc/bind/named.conf   | 18 +++++++++---------
 secondary/etc/bind/named.conf | 19 +++++++++----------
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Dockerfile.primary b/Dockerfile.primary
index e73bebc..4c7dc15 100644
--- a/Dockerfile.primary
+++ b/Dockerfile.primary
@@ -1,6 +1,6 @@
 FROM ubuntu/bind9:9.18-22.04_beta
 
-LABEL version="20240627.1.1"
+LABEL version="20240627.1.2"
 LABEL description="bind9 primary nameserver"
 
 ENV BIND_LIB_DIR=/var/lib/bind
diff --git a/Dockerfile.secondary b/Dockerfile.secondary
index 70e124d..fa5915c 100644
--- a/Dockerfile.secondary
+++ b/Dockerfile.secondary
@@ -1,6 +1,6 @@
 FROM ubuntu/bind9:9.18-22.04_beta
 
-LABEL version="20240627.1.1"
+LABEL version="20240627.1.2"
 LABEL description="bind9 secondary nameserver"
 
 ENV BIND_LIB_DIR=/var/lib/bind
diff --git a/docker-compose.yml b/docker-compose.yml
index 08bdd7e..2fffcc9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     container_name: ns1
     build:
       dockerfile: Dockerfile.primary
-    image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240627.1.1
+    image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240627.1.2
     restart: always
     user: root
     environment:
@@ -41,7 +41,7 @@ services:
     container_name: ns2
     build:
       dockerfile: Dockerfile.secondary
-    image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-secondary:240627.1.1
+    image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-secondary:240627.1.2
     restart: always
     user: root
     environment:
diff --git a/primary/etc/bind/named.conf b/primary/etc/bind/named.conf
index e5eb18c..ce8c41d 100755
--- a/primary/etc/bind/named.conf
+++ b/primary/etc/bind/named.conf
@@ -1,12 +1,3 @@
-options {
-        directory "/var/lib/bind";
-        dump-file "/var/log/named_dump.db";
-        statistics-file "/var/log/named.stats";
-	recursion no;
-	version "PiSS 0FF D0nK3y.";
-        notify yes;
-};
-
 acl "internal-nets" {
 	10.200.254.224/27;  //Utility_net
 	10.200.99.192/26;   //client_net
@@ -20,6 +11,15 @@ acl "internal-nets" {
 	10.99.23.0/24;	    //dev_infra
 };
 
+options {
+        directory "/var/lib/bind";
+        dump-file "/var/log/named_dump.db";
+        statistics-file "/var/log/named.stats";
+	allow-recursion { internal-nets; };
+	version "PiSS 0FF D0nK3y.";
+        notify yes;
+};
+
 zone "thelinuxpro.net" in {
         type master;
         file "/var/lib/bind/db.thelinuxpro.net";
diff --git a/secondary/etc/bind/named.conf b/secondary/etc/bind/named.conf
index a429f0c..8e815dc 100755
--- a/secondary/etc/bind/named.conf
+++ b/secondary/etc/bind/named.conf
@@ -1,13 +1,3 @@
-options {
-
-        directory "/var/lib/bind";
-        dump-file "/var/log/named_dump.db";
-        statistics-file "/var/log/named.stats";
-	recursion no;
-	version "PiSS 0FF D0nK3y.";
-        notify yes;
-};
-
 acl "internal-nets" {
 	10.200.254.224/27;  //Utility_net
 	10.200.99.192/26;   //client_net
@@ -21,6 +11,15 @@ acl "internal-nets" {
 	10.99.23.0/24;	    //dev_infra
 };
 
+options {
+        directory "/var/lib/bind";
+        dump-file "/var/log/named_dump.db";
+        statistics-file "/var/log/named.stats";
+	allow-recursion { internal-nets; };
+	version "PiSS 0FF D0nK3y.";
+        notify yes;
+};
+
 zone "thelinuxpro.net" in {
         type secondary;
         primaries { 10.99.153.241; };