fix update IP for A-fibia; fix drop bogus host ygramul.jones.dk (partly duplicating graograman.jones.dk and hykrion.jones.dk)

4 files changed, 10 insertions, 46 deletions

diff --git a/bind/fake-222/jones.dk b/bind/fake-222/jones.dk
index 6f2036b..6f60e83 100644
--- a/bind/fake-222/jones.dk
+++ b/bind/fake-222/jones.dk
@@ -136,14 +136,10 @@ fsub1 A 193.26.120.115
 
 $INCLUDE JONES.DK/skel/MX-avoid graograman
 $INCLUDE JONES.DK/skel/LOC graograman
-graograman A 192.168.222.2 ;87.104.3.163
+graograman A 192.168.222.2 ;A-fibia
  HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
- TXT "ISP=globalconnect.dk"
- TXT "Link=100Mbit"
- TXT "PTR=static-87-104-3-163.ip.fibianet.dk"
- TXT "Addr=Holbaek, Denmark"
  SSHFP 1 1 6c22504ade5ad8ca8f03dd6eb7618ad38c09d578
  SSHFP 1 2 61bdeb7d446dff43c9ea22d0d63315405b25fe9ff466ad8a82d26c18ae1ae83d
  SSHFP 3 1 018d018612589a7c0e0ce1914f14da42ef00c2e7
@@ -153,14 +149,10 @@ graograman A 192.168.222.2 ;87.104.3.163
 
 $INCLUDE JONES.DK/skel/MX-avoid koreander
 $INCLUDE JONES.DK/skel/LOC koreander
-koreander A 192.168.222.247 ;87.104.3.163
+koreander A 192.168.222.247 ;A-fibia
  HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
- TXT "ISP=globalconnect.dk"
- TXT "Link=100Mbit"
- TXT "PTR=static-87-104-3-163.ip.fibianet.dk"
- TXT "Addr=Holbaek, Denmark"
  SSHFP 1 1 070c7e186c360bde75212da95d16df61e236c64d
  SSHFP 1 2 218922f7c8a3d7e4f017d9f445c456b6b17b26abf732227cdb7561f50a5a0267
  SSHFP 3 1 02eacb98bd159ca9d7e1d9c1fb97db5165c06f82
@@ -255,15 +247,6 @@ perilin HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
  SSHFP 4 1 eb33d28d979e2a7f4ee37b7ed00e952a02248cfa
  SSHFP 4 2 1305bb2b86f85e03571af26e63132a0da15c48b9a24f90656ca569085e881778
 
-ygramul A 192.168.222.2 ; 5.186.122.171; via dhcp-5-186-122-171.cgn.ip.fibianet.dk
-$INCLUDE JONES.DK/skel/MX-avoid ygramul
-ygramul HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
- TXT "Desc=Gateway"
- TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
- TXT "ISP=Fibia"
- TXT "Link=fiber"
- TXT "CNAME=dhcp-5-186-122-171.cgn.ip.fibianet.dk"
-
 $INCLUDE JONES.DK/skel/A-cloud morla
 $INCLUDE JONES.DK/skel/MX-avoid morla
  HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux"
@@ -906,11 +889,6 @@ dharma A 192.168.222.125
 dharma HINFO "Intel Core2 Duo P7450 @ 2.13GHz (Apple MacBook5,2)" "Debian GNU/Linux"
  TXT "Owner=Siri Reiter"
 
-ygramul A 192.168.222.2 ; 5.186.122.171
-hykrion HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
- TXT "Desc=WiFi router"
- TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
-
 trabant A 192.168.222.3
  HINFO "Broadcom BCM5354 (LINKSYS WRT54G2 ver. ?)" "DD-WRT"
  TXT "Desc=WiFi router"
diff --git a/bind/pri/jones.dk b/bind/pri/jones.dk
index 5332ce2..cd92154 100644
--- a/bind/pri/jones.dk
+++ b/bind/pri/jones.dk
@@ -136,14 +136,10 @@ fsub1 A 193.26.120.115
 
 $INCLUDE JONES.DK/skel/MX-avoid graograman
 $INCLUDE JONES.DK/skel/LOC graograman
-graograman A 87.104.3.163
+graograman A-fibia
  HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
- TXT "ISP=globalconnect.dk"
- TXT "Link=100Mbit"
- TXT "PTR=static-87-104-3-163.ip.fibianet.dk"
- TXT "Addr=Holbaek, Denmark"
  SSHFP 1 1 6c22504ade5ad8ca8f03dd6eb7618ad38c09d578
  SSHFP 1 2 61bdeb7d446dff43c9ea22d0d63315405b25fe9ff466ad8a82d26c18ae1ae83d
  SSHFP 3 1 018d018612589a7c0e0ce1914f14da42ef00c2e7
@@ -153,14 +149,10 @@ graograman A 87.104.3.163
 
 $INCLUDE JONES.DK/skel/MX-avoid koreander
 $INCLUDE JONES.DK/skel/LOC koreander
-koreander A 87.104.3.163
+koreander A-fibia
  HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
  TXT "Desc=Gateway"
  TXT "Owner=IT guide dr. Jones v/ Jonas Smedegaard"
- TXT "ISP=globalconnect.dk"
- TXT "Link=100Mbit"
- TXT "PTR=static-87-104-3-163.ip.fibianet.dk"
- TXT "Addr=Holbaek, Denmark"
  SSHFP 1 1 070c7e186c360bde75212da95d16df61e236c64d
  SSHFP 1 2 218922f7c8a3d7e4f017d9f445c456b6b17b26abf732227cdb7561f50a5a0267
  SSHFP 3 1 02eacb98bd159ca9d7e1d9c1fb97db5165c06f82
@@ -247,15 +239,6 @@ perilin HINFO "Marvell Kirkwood @ 1.2GHz (DreamPlug)" "Debian GNU/Linux"
  SSHFP 4 1 eb33d28d979e2a7f4ee37b7ed00e952a02248cfa
  SSHFP 4 2 1305bb2b86f85e03571af26e63132a0da15c48b9a24f90656ca569085e881778
 
-$INCLUDE JONES.DK/skel/A-alt ygramul
-$INCLUDE JONES.DK/skel/MX-avoid ygramul
-ygramul HINFO "Allwinner Dual A20 @ 1GHz (OLimex A20-OLinuXino LIME2)" "Debian GNU/Linux"
- TXT "Desc=Gateway"
- TXT "Owner=IT-guide dr. Jones v/ Jonas Smedegaard"
- TXT "ISP=Fibia"
- TXT "Link=fiber"
- TXT "CNAME=dhcp-5-186-122-171.cgn.ip.fibianet.dk"
-
 $INCLUDE JONES.DK/skel/A-cloud morla
 $INCLUDE JONES.DK/skel/MX-avoid morla
  HINFO "Marvell Armada 370/XP Quad (Scaleway C1)" "Debian GNU/Linux"
diff --git a/bind/skel/A-alt b/bind/skel/A-alt
deleted file mode 100644
index c01a891..0000000
--- a/bind/skel/A-alt
+++ /dev/null
@@ -1,3 +0,0 @@
-@ A 5.186.122.171
-@ LOC 55 45 51.9 N 11 49 1.9 E 29m 6m
-@ TXT "Addr=Oroe"
diff --git a/bind/skel/A-fibia b/bind/skel/A-fibia
new file mode 100644
index 0000000..46c1adf
--- /dev/null
+++ b/bind/skel/A-fibia
@@ -0,0 +1,6 @@
+@ A 87.104.3.163
+@ LOC 55 45 51.9 N 11 49 1.9 E 29m 6m
+@ TXT "ISP=globalconnect.dk"
+@ TXT "Link=fiber"
+@ TXT "PTR=87.104.3.163.static.fibianet.dk"
+@ TXT "Addr=Holbaek, Denmark"