adjust run script

diff --git a/cfg/named.primary.conf b/cfg/named.primary.conf
index 6271875..cef4855 100644 (file)
--- a/cfg/named.primary.conf
+++ b/cfg/named.primary.conf
@@ -3,17 +3,17 @@ zone "blacka.com" {
     file "/var/lib/bind/blacka.com";
     dnssec-policy "simple_alg15";
     inline-signing yes;
-    
+
     notify yes;
-    also-notify { 
-        66.92.146.115; 
+    also-notify {
+        66.92.146.115;
         204.109.61.194;
     };
     allow-transfer {
-        127.0.0.1; 
-        key zeke-tornado.; 
-        key zeke-ogud2.; 
-        key zeke-ogud3; 
+        127.0.0.1;
+        key zeke-tornado.;
+        key zeke-ogud2.;
+        key zeke-ogud3;
     };
 };
 
@@ -21,11 +21,11 @@ zone "ecotroph.net" {
     type primary;
     file "/var/lib/bind/ecotroph.net";
     notify yes;
-    allow-transfer { 
-        127.0.0.1; 
-        key zeke-tornado.; 
-        key zeke-ogud2.; 
-        key zeke-ogud3; 
+    allow-transfer {
+        127.0.0.1;
+        key zeke-tornado.;
+        key zeke-ogud2.;
+        key zeke-ogud3;
     };
 };
 
@@ -48,10 +48,10 @@ zone "ecotroph.net" {
 #     file "/var/lib/bind/hxr.us";
 #     notify yes;
 #     allow-transfer {
-#         127.0.0.1; 
-#         66.92.146.115; 
-#         204.109.61.194; 
-#         66.92.146.160; 
+#         127.0.0.1;
+#         66.92.146.115;
+#         204.109.61.194;
+#         66.92.146.160;
 #         64.151.105.12;
 #     };
 # };
@@ -71,7 +71,7 @@ zone "ecotroph.net" {
 # };
 
 # Note: no longer registered
-zone "fallschurchdissident.us" {
+# zone "fallschurchdissident.us" {
 #     type primary;
 #     file "/var/lib/bind/fallschurchdissident.us";
 #     notify yes;
@@ -85,11 +85,11 @@ zone "fallschurchdissident.us" {
 # };
 
 # Note: no longer registered
-zone "fallschurchdissident.com" {
+# zone "fallschurchdissident.com" {
 #     type primary;
 #     file "/var/lib/bind/fallschurchdissident.com";
 #     notify yes;
-#     allow-transfer { 
+#     allow-transfer {
 #         127.0.0.1;
 #         66.92.146.115;
 #         204.109.61.194;
@@ -103,7 +103,7 @@ zone "fallschurchdissident.com" {
 #     type primary;
 #     file "/var/lib/bind/t.hxr.us";
 #     allow-transfer {
-#         127.0.0.1; 
+#         127.0.0.1;
 #         64.151.105.12;
 #     };
 # };
@@ -112,8 +112,8 @@ zone "fallschurchdissident.com" {
 # zone "dyn.hxr.us" {
 #     type primary;
 #     file "/var/lib/bind/dyn/dyn.hxr.us";
-#     allow-transfer { 
-#         127.0.0.1; 
+#     allow-transfer {
+#         127.0.0.1;
 #         64.151.105.12;
 #     };
 #     update-policy { grant * self * A; };
@@ -124,12 +124,12 @@ zone "kosters.net" {
     type primary;
     file "/var/lib/bind/kosters.net";
     notify yes;
-    also-notify { 
+    also-notify {
         65.201.175.12;
         66.92.146.115;
         204.109.61.194;
     };
-    allow-transfer { 
+    allow-transfer {
         127.0.0.1;
         65.201.175.11;
         65.201.175.12;
@@ -148,12 +148,12 @@ zone "bjmk.com" {
     type primary;
     file "/var/lib/bind/bjmk.com";
     notify yes;
-    also-notify { 
-        65.201.175.12; 
-        66.92.146.115; 
+    also-notify {
+        65.201.175.12;
+        66.92.146.115;
         204.109.61.194;
     };
-    allow-transfer { 
+    allow-transfer {
         127.0.0.1;
         65.201.175.11;
         65.201.175.12;
@@ -163,7 +163,7 @@ zone "bjmk.com" {
         70.164.18.41;
         70.164.18.42;
         207.234.133.162;
-        key zeke-ogud2.; 
+        key zeke-ogud2.;
         key zeke-ogud3;
     };
 };
@@ -173,12 +173,12 @@ zone "bjmk.com" {
 #     type primary;
 #     file "/var/lib/bind/gracecrc.org";
 #     notify yes;
-#     also-notify { 
-#         65.201.175.12; 
-#         66.92.146.115; 
-#         204.109.61.194; 
+#     also-notify {
+#         65.201.175.12;
+#         66.92.146.115;
+#         204.109.61.194;
 #     };
-#     allow-transfer { 
+#     allow-transfer {
 #         127.0.0.1;
 #         65.201.175.11;
 #         65.201.175.12;
@@ -198,7 +198,7 @@ zone "bjmk.com" {
 #     type primary;
 #     file "/var/lib/bind/toscano.org";
 #     notify yes;
-#     allow-transfer { 
+#     allow-transfer {
 #         127.0.0.1;
 #         202.157.185.115;
 #         202.157.182.142;
@@ -210,7 +210,7 @@ zone "bjmk.com" {
 #     type primary;
 #     file "/var/lib/bind/prevelige.org";
 #     notify yes;
-#     allow-transfer { 
+#     allow-transfer {
 #         127.0.0.1;
 #         202.157.185.115;
 #         202.157.182.142;

diff --git a/run_bind.sh b/run_bind.sh
index 2ddda78..4af2eac 100755 (executable)
--- a/run_bind.sh
+++ b/run_bind.sh
@@ -3,7 +3,8 @@
 BASE_CONF_DIR=/etc/bind
 : "${DNS_PORT:=53}"
 : "${RNDC_PORT:=953}"
-[ "$1" = "interactive" ] && ARGS="-ti --entrypoint=/bin/bash"
+CMD="/usr/sbin/named -c /etc/bind/named.conf -4 -f"
+[ "$1" = "interactive" ] && ARGS="-ti --entrypoint=/bin/bash" && CMD=""
 
 # shellcheck disable=SC2086
 docker run $ARGS \
@@ -17,5 +18,4 @@ docker run $ARGS \
     -v $BASE_CONF_DIR/cache:/var/cache/bind \
     -v $BASE_CONF_DIR/zones:/var/lib/bind \
     -v $BASE_CONF_DIR/log:/var/log \
-    docker.io/internetsystemsconsortium/bind9:9.18 \
-    /usr/sbin/named -c /etc/bind/named.conf -4 -f
+    docker.io/internetsystemsconsortium/bind9:9.18 $CMD