From: Alex Dehnert <alex@dehnerts.com>
Date: Sat, 20 May 2017 18:51:30 +0000 (-0400)
Subject: Remove uses of 18.208.* addresses
X-Git-Url: https://dehnerts.com/gitweb/?a=commitdiff_plain;h=3ae79e96c30a28b80510e3c8aa4220fb21a21455;p=sysconfig%2Fbind.git

Remove uses of 18.208.* addresses

- Use newer olinda IP for the transfer and recursion ACLs
- remove olinda1's A record -- not much point, since it's gone
- remove persistent-dialup -- the moira record seems to be gone, and it doesn't
  seem worth resurrecting the service
- Bump serial
---

diff --git a/named.conf.local b/named.conf.local
index 1b931dc..d0e1f75 100644
--- a/named.conf.local
+++ b/named.conf.local
@@ -16,7 +16,7 @@ zone "dehnert.arctic.org" IN {
 	type master;
 	file "/etc/bind/pri/combined-dehnerts.zone";
 	allow-update { none; };
-	allow-transfer { localhost;  207.29.250.54; 18.181.0.36; 74.207.246.137; 66.92.29.156; 18.208.0.204; };
+	allow-transfer { localhost;  207.29.250.54; 18.181.0.36; 74.207.246.137; 66.92.29.156; 18.102.208.15; };
 	allow-query { any; };
 	notify no;
 };
@@ -24,7 +24,7 @@ zone "dehnerts.com" IN {
 	type master;
 	file "/etc/bind/pri/combined-dehnerts.zone";
 	allow-update { none; };
-	allow-transfer { localhost;  207.29.250.54; 18.181.0.36; 74.207.246.137; 66.92.29.156; 18.208.0.204; };
+	allow-transfer { localhost;  207.29.250.54; 18.181.0.36; 74.207.246.137; 66.92.29.156; 18.102.208.15; };
 	allow-query { any; };
 	notify no;
 };
diff --git a/named.conf.options b/named.conf.options
index 42d679d..31f56b2 100644
--- a/named.conf.options
+++ b/named.conf.options
@@ -26,7 +26,7 @@ options {
 	// ALEX DEHNERT: copied from old arctic version on 2008-12-19
 	//ALEX DEHNERT: Security-related stuff:
 	// Secure(ish):
-	allow-recursion	{ 18.208.0.204; 66.92.29.156; 66.92.29.144; 127.0.0.1; 192.168.0.0/16; 18.0.0.0/8; };
+	allow-recursion	{ 18.102.208.15; 66.92.29.156; 66.92.29.144; 127.0.0.1; 192.168.0.0/16; 18.0.0.0/8; };
 	//allow-query	{ 66.92.29.156; 66.92.29.144; 127.0.0.1; };
 	allow-transfer { none; };
 
diff --git a/pri/combined-dehnerts.zone b/pri/combined-dehnerts.zone
index 54150b4..faf94fe 100644
--- a/pri/combined-dehnerts.zone
+++ b/pri/combined-dehnerts.zone
@@ -1,6 +1,6 @@
 $TTL 1h
 @       IN      SOA     ns root (
-                                    2017051901 ; Serial
+                                    2017052001 ; Serial
                                     4h         ; slave refresh
                                     15m        ; slave retry time in case of a problem
                                     4w         ; slave expiration time
@@ -29,7 +29,6 @@ gwynedd	IN A 192.168.1.16
 *.gwynedd	IN CNAME	gwynedd
 lushan  IN  CNAME   lushan2.mit.edu.
 masada  IN  A   18.102.208.16
-olinda1 IN  A   18.208.0.204
 olinda  IN  A   18.102.208.15
 novgorod  IN  CNAME   novgorod.mit.edu.
 
@@ -87,8 +86,6 @@ borobudur.intern-extern-bridge  IN A 192.168.2.2
 ; Miscellaneous extra services
 evols	IN	A	64.202.163.10
 dns2tcp	IN	NS	novgorod.mit.edu.
-persistent-dialup	IN	NS	persistent-dialup-ns1
-persistent-dialup-ns1	IN	A	18.208.0.249
 
 ; SRV records
 _xmpp-client._tcp.jabber     3600 IN SRV 10 0 5222 jabber.dehnerts.com.