From 81f21c135ea7ff05e85c2ec0b833532fe47e2618 Mon Sep 17 00:00:00 2001 From: Xuu Date: Mon, 20 Nov 2017 20:02:57 +0000 Subject: [PATCH] merging registry into git --- data/as-block/AS1-AS4294967294 | 1 - data/as-block/AS4242420000-AS4242423999 | 1 - data/as-block/AS4242424000-AS4242426999 | 1 - data/as-block/AS4242427000-AS4242429999 | 1 - data/as-block/AS64512-AS65534 | 1 - data/as-block/AS64600-AS64855 | 1 - data/as-block/AS64856-AS64999 | 1 - data/as-block/AS76100-AS76199 | 1 - data/as-set/AS-FREIFUNK | 2 +- data/as-set/AS-GRMML | 1 - data/aut-num/AS4242420000 | 7 +++++++ data/aut-num/AS4242420037 | 12 ++++++------ data/aut-num/AS4242420125 | 1 - data/aut-num/AS4242420429 | 1 - data/aut-num/AS4242423472 | 2 +- data/aut-num/AS4242423641 | 2 +- data/aut-num/AS4242423650 | 12 ++++++------ data/aut-num/AS64833 | 1 - data/aut-num/AS76115 | 7 +++---- data/inet6num/fd42:2935:3546::_48 | 2 +- data/inet6num/fdd6:aff6:5f6f::_48 | 1 - data/inetnum/172.20.13.160_27 | 2 +- data/inetnum/172.20.189.0_25 | 18 +++++++++--------- data/inetnum/172.21.125.64_27 | 18 +++++++++--------- data/inetnum/172.22.141.128_28 | 2 +- data/inetnum/172.22.141.176_28 | 2 +- data/inetnum/172.22.152.0_25 | 7 +++---- data/inetnum/172.22.168.128_25 | 7 +++---- data/inetnum/172.22.170.0_24 | 7 +++---- data/inetnum/172.22.171.0_24 | 7 +++---- data/inetnum/172.22.173.0_24 | 5 ++--- data/inetnum/172.22.251.128_26 | 3 +-- data/inetnum/172.22.255.32_27 | 1 - data/inetnum/172.22.37.0_24 | 5 ++--- data/inetnum/172.22.42.0_24 | 5 ++--- data/inetnum/172.22.44.0_23 | 5 ++--- data/inetnum/172.22.53.0_24 | 9 ++++----- data/inetnum/172.22.55.0_24 | 7 +++---- data/inetnum/172.23.138.0_23 | 1 - data/inetnum/172.23.164.0_23 | 5 ++--- data/inetnum/172.23.241.0_24 | 9 +++++---- data/inetnum/172.23.242.0_24 | 9 +++++---- data/inetnum/172.23.42.0_24 | 9 +++++++++ data/mntner/GRMML-MNT | 1 + data/mntner/OPTIC-MNT | 2 +- data/mntner/UNGNT-MNT | 12 ++++++------ data/mntner/UTLEYCCKS-MNT | 12 ++++++------ data/person/FXKR-DN42 | 1 - data/person/JUTLEY-DN42 | 10 +++++----- data/person/OPTIC-DN42 | 2 +- data/person/PYROPETER-DN42 | 3 ++- data/person/RZL-DN42 | 1 - data/person/UNGNT-DN42 | 10 +++++----- data/role/ALENAN-DN42 | 1 - data/role/CCCKC-DN42 | 1 - data/role/ORG-YANE-DN42 | 1 - data/route/10.83.0.0_16 | 1 - data/route/172.20.13.160_27 | 2 +- data/route/172.21.101.128_27 | 2 +- data/route/172.21.125.64_27 | 2 +- data/route/172.22.1.0_24 | 1 - data/route/172.22.41.240_28 | 1 + data/route/{172.23.0.80_28 => 172.23.0.80_32} | 2 +- data/route/172.23.138.0_23 | 1 - data/route/172.23.196.0_24 | 1 + data/route/172.23.202.0_24 | 1 + data/route/172.23.42.0_24 | 1 + data/route6/fd42:23:42::_48 | 5 +++++ data/route6/fda1:d26b:7461::_48 | 1 + data/tinc-key/DEFIANTPORT2-TINC | 2 +- data/tinc-key/DODGER78-TINC | 2 +- data/tinc-key/DOWNHILL-TINC | 2 +- data/tinc-key/FISHYSNAX-TINC | 2 +- data/tinc-key/MERLIN-TINC | 2 +- data/tinc-key/MNL-TINC | 2 +- data/tinc-key/NULLL-TINC | 2 +- data/tinc-key/PETRUS-TINC | 2 +- data/tinc-key/SCHRODINGER-TINC | 2 +- data/tinc-key/UFO-TINC | 3 +-- 79 files changed, 147 insertions(+), 154 deletions(-) create mode 100644 data/aut-num/AS4242420000 create mode 100644 data/inetnum/172.23.42.0_24 rename data/route/{172.23.0.80_28 => 172.23.0.80_32} (88%) create mode 100644 data/route6/fd42:23:42::_48 diff --git a/data/as-block/AS1-AS4294967294 b/data/as-block/AS1-AS4294967294 index b47bf3a3f..d9b8022b8 100644 --- a/data/as-block/AS1-AS4294967294 +++ b/data/as-block/AS1-AS4294967294 @@ -4,4 +4,3 @@ remarks: This block is reserved to delegate access for sub-allocations remarks: You can not freely register any ASN in this block. mnt-by: DUMMY-MNT policy: closed - diff --git a/data/as-block/AS4242420000-AS4242423999 b/data/as-block/AS4242420000-AS4242423999 index 88ec96be7..a3bd8494e 100644 --- a/data/as-block/AS4242420000-AS4242423999 +++ b/data/as-block/AS4242420000-AS4242423999 @@ -5,4 +5,3 @@ remarks: You can freely register any ASN in this block. remarks: However, please don't allocate sub-blocks in this ASN space. mnt-by: DUMMY-MNT policy: open - diff --git a/data/as-block/AS4242424000-AS4242426999 b/data/as-block/AS4242424000-AS4242426999 index f4502b9d3..97a67cbc4 100644 --- a/data/as-block/AS4242424000-AS4242426999 +++ b/data/as-block/AS4242424000-AS4242426999 @@ -3,4 +3,3 @@ descr: Future dn42 use remarks: This block is reserved for future dn42 use. mnt-by: DUMMY-MNT policy: closed - diff --git a/data/as-block/AS4242427000-AS4242429999 b/data/as-block/AS4242427000-AS4242429999 index b3cac1c7b..4c7fa8122 100644 --- a/data/as-block/AS4242427000-AS4242429999 +++ b/data/as-block/AS4242427000-AS4242429999 @@ -4,4 +4,3 @@ remarks: This block is reserved for sub-allocations. remarks: Please don't allocate individual ASN directly in this block. mnt-by: DUMMY-MNT policy: ask - diff --git a/data/as-block/AS64512-AS65534 b/data/as-block/AS64512-AS65534 index 7ecdb167a..3a697a439 100644 --- a/data/as-block/AS64512-AS65534 +++ b/data/as-block/AS64512-AS65534 @@ -2,4 +2,3 @@ as-block: AS64512 - AS65534 descr: Private ASN block mnt-by: DUMMY-MNT policy: closed - diff --git a/data/as-block/AS64600-AS64855 b/data/as-block/AS64600-AS64855 index 0e2c1babd..a90f42a3d 100644 --- a/data/as-block/AS64600-AS64855 +++ b/data/as-block/AS64600-AS64855 @@ -5,4 +5,3 @@ remarks: With the default allocation policy of an /25 per person now t remarks: Please only make an assignment from this block if you can't use 4 byte ASNs. mnt-by: DUMMY-MNT policy: ask - diff --git a/data/as-block/AS64856-AS64999 b/data/as-block/AS64856-AS64999 index 114ff0f65..7205edf6c 100644 --- a/data/as-block/AS64856-AS64999 +++ b/data/as-block/AS64856-AS64999 @@ -5,4 +5,3 @@ remarks: by IANA instead of the 76100-76199 block. remarks: Please only make an assignment from this block if you can't use 4 byte ASNs. mnt-by: DUMMY-MNT policy: open - diff --git a/data/as-block/AS76100-AS76199 b/data/as-block/AS76100-AS76199 index 170701ab9..2f914a90f 100644 --- a/data/as-block/AS76100-AS76199 +++ b/data/as-block/AS76100-AS76199 @@ -6,4 +6,3 @@ remarks: "reserved" AS numbers. remarks: The use of this block is now strongly discouraged. mnt-by: DUMMY-MNT policy: closed - diff --git a/data/as-set/AS-FREIFUNK b/data/as-set/AS-FREIFUNK index 88532cc64..707e3ba5a 100644 --- a/data/as-set/AS-FREIFUNK +++ b/data/as-set/AS-FREIFUNK @@ -15,4 +15,4 @@ members: AS65513 members: AS65526 members: AS65529 members: AS65525 -mnt-by: DUMMY-MNT +mnt-by: FREIFUNKDUMMY-MNT diff --git a/data/as-set/AS-GRMML b/data/as-set/AS-GRMML index 5a173147e..c9df0fe62 100644 --- a/data/as-set/AS-GRMML +++ b/data/as-set/AS-GRMML @@ -6,4 +6,3 @@ members: AS4242420120 members: AS4242420121 members: AS4242420122 members: AS4242420123 - diff --git a/data/aut-num/AS4242420000 b/data/aut-num/AS4242420000 new file mode 100644 index 000000000..e2dc10a44 --- /dev/null +++ b/data/aut-num/AS4242420000 @@ -0,0 +1,7 @@ +aut-num: AS4242420000 +org: ORG-CCCHB +as-name: PYROPETER-AS +descr: PyroPeters AS +admin-c: PYROPETER-DN42 +tech-c: PYROPETER-DN42 +mnt-by: PYROPETER-MNT diff --git a/data/aut-num/AS4242420037 b/data/aut-num/AS4242420037 index cd8014ff0..05147e22b 100644 --- a/data/aut-num/AS4242420037 +++ b/data/aut-num/AS4242420037 @@ -1,6 +1,6 @@ -aut-num: AS4242420037 -admin-c: JUTLEY-DN42 -tech-c: JUTLEY-DN42 -mnt-by: UTLEYCCKS-MNT -as-name: UTLEYCC KS AS -descr: UTLEYCC KS ASN +aut-num: AS4242420037 +admin-c: JUTLEY-DN42 +tech-c: JUTLEY-DN42 +mnt-by: UTLEYCCKS-MNT +as-name: UTLEYCC KS AS +descr: UTLEYCC KS ASN diff --git a/data/aut-num/AS4242420125 b/data/aut-num/AS4242420125 index 79c598cac..770b78db6 100644 --- a/data/aut-num/AS4242420125 +++ b/data/aut-num/AS4242420125 @@ -3,4 +3,3 @@ as-name: CCCHH-AS admin-c: FRITZ-DN42 tech-c: FRITZ-DN42 mnt-by: FRITZ-MNT - diff --git a/data/aut-num/AS4242420429 b/data/aut-num/AS4242420429 index b909073d6..8d2830372 100644 --- a/data/aut-num/AS4242420429 +++ b/data/aut-num/AS4242420429 @@ -4,4 +4,3 @@ descr: hax404's AS admin-c: HAX404-DN42 mnt-by: HAX404-MNT tech-c: HAX404-DN42 - diff --git a/data/aut-num/AS4242423472 b/data/aut-num/AS4242423472 index e640e5314..dba50e177 100644 --- a/data/aut-num/AS4242423472 +++ b/data/aut-num/AS4242423472 @@ -3,4 +3,4 @@ as-name: OPTICS-AS descr: OPTIC admin-c: OPTIC-DN42 tech-c: OPTIC-DN42 -mnt-by: OPTIC-MNT \ No newline at end of file +mnt-by: OPTIC-MNT diff --git a/data/aut-num/AS4242423641 b/data/aut-num/AS4242423641 index c56525b97..be6ce1442 100644 --- a/data/aut-num/AS4242423641 +++ b/data/aut-num/AS4242423641 @@ -2,4 +2,4 @@ aut-num: AS4242423641 admin-c: JAMIE9898-DN42 tech-c: JAMIE9898-DN42 mnt-by: HESSENET-MNT -as-name: HESSENET-DE \ No newline at end of file +as-name: HESSENET-DE diff --git a/data/aut-num/AS4242423650 b/data/aut-num/AS4242423650 index 9d9a35a65..cbdc96e30 100644 --- a/data/aut-num/AS4242423650 +++ b/data/aut-num/AS4242423650 @@ -1,6 +1,6 @@ -aut-num: AS4242423650 -admin-c: UNGNT-DN42 -tech-c: UNGNT-DN42 -mnt-by: UNGNT-MNT -as-name: UNGNT AS -descr: UNGNT ASN \ No newline at end of file +aut-num: AS4242423650 +admin-c: UNGNT-DN42 +tech-c: UNGNT-DN42 +mnt-by: UNGNT-MNT +as-name: UNGNT AS +descr: UNGNT ASN diff --git a/data/aut-num/AS64833 b/data/aut-num/AS64833 index 659a205e0..c5f266f45 100644 --- a/data/aut-num/AS64833 +++ b/data/aut-num/AS64833 @@ -4,4 +4,3 @@ descr: fxkr's AS admin-c: FXKR-DN42 tech-c: FXKR-DN42 mnt-by: FXKR-MNT - diff --git a/data/aut-num/AS76115 b/data/aut-num/AS76115 index 313a8d86d..4ebdc74d0 100644 --- a/data/aut-num/AS76115 +++ b/data/aut-num/AS76115 @@ -1,8 +1,7 @@ aut-num: AS76115 org: ORG-CCCHB -as-name: PYROPETER-AS -descr: PyroPeter's home AS -remarks: route information goes here +as-name: PYROPETER-DEPRECATED-AS +descr: PyroPeters old ASN (deprecated, moved to 64864) admin-c: PYROPETER-DN42 tech-c: PYROPETER-DN42 -mnt-by: DUMMY-MNT +mnt-by: PYROPETER-MNT diff --git a/data/inet6num/fd42:2935:3546::_48 b/data/inet6num/fd42:2935:3546::_48 index 90b479559..c88fc7cab 100644 --- a/data/inet6num/fd42:2935:3546::_48 +++ b/data/inet6num/fd42:2935:3546::_48 @@ -5,5 +5,5 @@ country: BE admin-c: ALTF4-DN42 tech-c: ALTF4-DN42 mnt-by: ALTF4-MNT -status: ASSIGNMENT +status: ASSIGNED cidr: fd42:2935:3546::/48 diff --git a/data/inet6num/fdd6:aff6:5f6f::_48 b/data/inet6num/fdd6:aff6:5f6f::_48 index 43aa8b722..8eff4555a 100644 --- a/data/inet6num/fdd6:aff6:5f6f::_48 +++ b/data/inet6num/fdd6:aff6:5f6f::_48 @@ -13,4 +13,3 @@ status: ASSIGNED PA nserver: ns.p5.flhb.de ds-rdata: 24396 7 1 CE4CA1EEE1AF124B7EA84D9995E3BAD711856339 ds-rdata: 24396 7 2 6F6C0CF7F7582CB1866861749BBC8226F25377C3C22AE43DFA0A3C52 A76E4F7F - diff --git a/data/inetnum/172.20.13.160_27 b/data/inetnum/172.20.13.160_27 index 52eb90f7c..9ed5123ca 100644 --- a/data/inetnum/172.20.13.160_27 +++ b/data/inetnum/172.20.13.160_27 @@ -6,4 +6,4 @@ tech-c: OPTIC-DN42 mnt-by: OPTIC-MNT nserver: ns1.evenet.dn42 nserver: ns2.evenet.dn42 -status: ASSIGNED \ No newline at end of file +status: ASSIGNED diff --git a/data/inetnum/172.20.189.0_25 b/data/inetnum/172.20.189.0_25 index 8f02d170e..c09eeae04 100644 --- a/data/inetnum/172.20.189.0_25 +++ b/data/inetnum/172.20.189.0_25 @@ -1,9 +1,9 @@ -inetnum: 172.20.189.0-172.20.189.127 -netname: UTLEYCCKS-NET -descr: UTLEYCC KS Network -country: US -admin-c: JUTLEY-DN42 -tech-c: JUTLEY-DN42 -mnt-by: UTLEYCCKS-MNT -status: ASSIGNED -cidr: 172.20.189.0/25 +inetnum: 172.20.189.0-172.20.189.127 +netname: UTLEYCCKS-NET +descr: UTLEYCC KS Network +country: US +admin-c: JUTLEY-DN42 +tech-c: JUTLEY-DN42 +mnt-by: UTLEYCCKS-MNT +status: ASSIGNED +cidr: 172.20.189.0/25 diff --git a/data/inetnum/172.21.125.64_27 b/data/inetnum/172.21.125.64_27 index cdd1fe0dc..20bc9991b 100644 --- a/data/inetnum/172.21.125.64_27 +++ b/data/inetnum/172.21.125.64_27 @@ -1,9 +1,9 @@ -inetnum: 172.21.125.64-172.21.125.95 -netname: UNGNT-NET -descr: UNGNT Network -country: AU -admin-c: UNGNT-DN42 -tech-c: UNGNT-DN42 -mnt-by: UNGNT-MNT -status: ASSIGNED -cidr: 172.21.125.64/27 +inetnum: 172.21.125.64-172.21.125.95 +netname: UNGNT-NET +descr: UNGNT Network +country: AU +admin-c: UNGNT-DN42 +tech-c: UNGNT-DN42 +mnt-by: UNGNT-MNT +status: ASSIGNED +cidr: 172.21.125.64/27 diff --git a/data/inetnum/172.22.141.128_28 b/data/inetnum/172.22.141.128_28 index 5fabe618d..d166d013f 100644 --- a/data/inetnum/172.22.141.128_28 +++ b/data/inetnum/172.22.141.128_28 @@ -2,7 +2,7 @@ inetnum: 172.22.141.128 - 172.22.141.143 cidr: 172.22.141.128/28 netname: XUU-US-DN42 descr: Xuu US Network -country: Utah, US +country: US admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/inetnum/172.22.141.176_28 b/data/inetnum/172.22.141.176_28 index bc8704c17..02d9337c1 100644 --- a/data/inetnum/172.22.141.176_28 +++ b/data/inetnum/172.22.141.176_28 @@ -2,7 +2,7 @@ inetnum: 172.22.141.176 - 172.22.141.191 cidr: 172.22.141.176/28 netname: XUU-CA-DN42 descr: Xuu CA Network -country: Montrial, CA +country: CA admin-c: SOURIS-DN42 tech-c: SOURIS-DN42 mnt-by: XUU-MNT diff --git a/data/inetnum/172.22.152.0_25 b/data/inetnum/172.22.152.0_25 index 4ca900ddc..8a5c5d40b 100644 --- a/data/inetnum/172.22.152.0_25 +++ b/data/inetnum/172.22.152.0_25 @@ -1,10 +1,9 @@ inetnum: 172.22.152.0 - 172.22.152.127 nserver: ns.allo.dn42 netname: ALLO's dn42 network -country: unknown to resdb admin-c: ALLO-DN42 tech-c: ALLO-DN42 status: ASSIGNED -bgp-status: active -cidr: 172.22.152.0/25 -mnt-by: DUMMY-MNT +bgp-status: active +cidr: 172.22.152.0/25 +mnt-by: DUMMY-MNT diff --git a/data/inetnum/172.22.168.128_25 b/data/inetnum/172.22.168.128_25 index 273db9034..4a04f7a78 100644 --- a/data/inetnum/172.22.168.128_25 +++ b/data/inetnum/172.22.168.128_25 @@ -1,10 +1,9 @@ inetnum: 172.22.168.128 - 172.22.168.255 nserver: ns.allo.dn42 netname: ALLO's dn42 network -country: unknown to resdb admin-c: ALLO-DN42 tech-c: ALLO-DN42 status: ASSIGNED -bgp-status: active -cidr: 172.22.168.128/25 -mnt-by: DUMMY-MNT +bgp-status: active +cidr: 172.22.168.128/25 +mnt-by: DUMMY-MNT diff --git a/data/inetnum/172.22.170.0_24 b/data/inetnum/172.22.170.0_24 index 4ea561a5f..30c0cd524 100644 --- a/data/inetnum/172.22.170.0_24 +++ b/data/inetnum/172.22.170.0_24 @@ -1,10 +1,9 @@ inetnum: 172.22.170.0 - 172.22.170.255 nserver: ns0.docsteel.dn42 netname: Docsteel's dn42 network -country: unknown to resdb admin-c: DOCSTEEL-DN42 tech-c: DOCSTEEL-DN42 status: ASSIGNED -bgp-status: active -cidr: 172.22.170.0/24 -mnt-by: DUMMY-MNT +bgp-status: active +cidr: 172.22.170.0/24 +mnt-by: DUMMY-MNT diff --git a/data/inetnum/172.22.171.0_24 b/data/inetnum/172.22.171.0_24 index 9fd3d7458..d8a113649 100644 --- a/data/inetnum/172.22.171.0_24 +++ b/data/inetnum/172.22.171.0_24 @@ -1,10 +1,9 @@ inetnum: 172.22.171.0 - 172.22.171.255 nserver: ns0.docsteel.dn42 netname: Docsteel's dn42 Home Network -country: unknown to resdb admin-c: DOCSTEEL-DN42 tech-c: DOCSTEEL-DN42 status: ASSIGNED -bgp-status: inactive 1505145604 -cidr: 172.22.171.0/24 -mnt-by: DUMMY-MNT +bgp-status: inactive 1505145604 +cidr: 172.22.171.0/24 +mnt-by: DUMMY-MNT diff --git a/data/inetnum/172.22.173.0_24 b/data/inetnum/172.22.173.0_24 index abc311d79..8d5a40010 100644 --- a/data/inetnum/172.22.173.0_24 +++ b/data/inetnum/172.22.173.0_24 @@ -1,10 +1,9 @@ inetnum: 172.22.173.0 - 172.22.173.255 nserver: ns0.j.dn42 netname: jomat's dn42 network -country: unknown to resdb admin-c: JOMAT-DN42 tech-c: JOMAT-DN42 status: ASSIGNED mnt-by: JOMAT-MNT -bgp-status: inactive 1499803339 -cidr: 172.22.173.0/24 +bgp-status: inactive 1499803339 +cidr: 172.22.173.0/24 diff --git a/data/inetnum/172.22.251.128_26 b/data/inetnum/172.22.251.128_26 index c32589c79..bddf8cca4 100644 --- a/data/inetnum/172.22.251.128_26 +++ b/data/inetnum/172.22.251.128_26 @@ -1,7 +1,6 @@ inetnum: 172.22.251.128 - 172.22.251.191 netname: HAX404-DN42-TRANSFER descr: hax404's Transfer Network -country: N/A admin-c: HAX404-DN42 tech-c: HAX404-DN42 mnt-by: HAX404-MNT @@ -9,4 +8,4 @@ nserver: chero.hax404.dn42 nserver: froschschenkel.hax404.dn42 status: ASSIGNED bgp-status: ignore -cidr: 172.22.251.128/26 +cidr: 172.22.251.128/26 diff --git a/data/inetnum/172.22.255.32_27 b/data/inetnum/172.22.255.32_27 index 1d8611efb..e9a42ba39 100644 --- a/data/inetnum/172.22.255.32_27 +++ b/data/inetnum/172.22.255.32_27 @@ -7,5 +7,4 @@ tech-c: STV0G-DN42 mnt-by: NULLL-MNT status: ASSIGNED bgp-status: ignore - cidr: 172.22.255.32/27 diff --git a/data/inetnum/172.22.37.0_24 b/data/inetnum/172.22.37.0_24 index 115e48a50..eb26f0103 100644 --- a/data/inetnum/172.22.37.0_24 +++ b/data/inetnum/172.22.37.0_24 @@ -1,9 +1,8 @@ inetnum: 172.22.37.0 - 172.22.37.255 netname: NET-NONAME-DN42 -country: N/A admin-c: NONAME-DN42 tech-c: NONAME-DN42 mnt-by: DUMMY-MNT status: ASSIGNED -bgp-status: active -cidr: 172.22.37.0/24 +bgp-status: active +cidr: 172.22.37.0/24 diff --git a/data/inetnum/172.22.42.0_24 b/data/inetnum/172.22.42.0_24 index 05e22167f..947f5f7cb 100644 --- a/data/inetnum/172.22.42.0_24 +++ b/data/inetnum/172.22.42.0_24 @@ -1,9 +1,8 @@ inetnum: 172.22.42.0 - 172.22.42.255 netname: NET-MAXX-DN42 -country: N/A admin-c: MAXX-DN42 tech-c: MAXX-DN42 mnt-by: DUMMY-MNT status: ASSIGNED -bgp-status: active -cidr: 172.22.42.0/24 +bgp-status: active +cidr: 172.22.42.0/24 diff --git a/data/inetnum/172.22.44.0_23 b/data/inetnum/172.22.44.0_23 index 30c1847a8..0a112d320 100644 --- a/data/inetnum/172.22.44.0_23 +++ b/data/inetnum/172.22.44.0_23 @@ -1,9 +1,8 @@ inetnum: 172.22.44.0 - 172.22.45.255 netname: NET-JCHOME-DN42 -country: N/A admin-c: JCHOME-DN42 tech-c: JCHOME-DN42 mnt-by: JCIX-MNT status: ASSIGNED -bgp-status: active -cidr: 172.22.44.0/23 +bgp-status: active +cidr: 172.22.44.0/23 diff --git a/data/inetnum/172.22.53.0_24 b/data/inetnum/172.22.53.0_24 index d7ae0287b..22cbc46d5 100644 --- a/data/inetnum/172.22.53.0_24 +++ b/data/inetnum/172.22.53.0_24 @@ -2,12 +2,11 @@ inetnum: 172.22.53.0 - 172.22.53.255 nserver: uz5d3wnxjz4knk85k92hpvukwt03frmkv12k4lp3jxw8gmtdvfbvqr.ns.somerandomnick.dn42 nserver: uz5ynfcj3ldl4sl9zlqmn8g6740guhrp8vz4xmv2hvd3bc3bth120p.ns.somerandomnick.dn42 netname: SRN's anycast DNS experiment -country: AnonetLand descr: http://www.srn.dn42/crazydns -remarks: To participate, please contact SRN. +remarks: To participate, please contact SRN. admin-c: SRN-DN42 tech-c: SRN-DN42 status: ASSIGNED -bgp-status: active -cidr: 172.22.53.0/24 -mnt-by: DUMMY-MNT +bgp-status: active +cidr: 172.22.53.0/24 +mnt-by: DUMMY-MNT diff --git a/data/inetnum/172.22.55.0_24 b/data/inetnum/172.22.55.0_24 index aa2e28223..2cdf5aa2d 100644 --- a/data/inetnum/172.22.55.0_24 +++ b/data/inetnum/172.22.55.0_24 @@ -1,10 +1,9 @@ inetnum: 172.22.55.0 - 172.22.55.255 nserver: ns.geekhabitat.dn42 netname: DOWNHILL's dn42 network -country: unknown to resdb admin-c: DOWNHILL-DN42 tech-c: DOWNHILL-DN42 status: ASSIGNED -bgp-status: inactive 1506744005 -cidr: 172.22.55.0/24 -mnt-by: DUMMY-MNT +bgp-status: inactive 1506744005 +cidr: 172.22.55.0/24 +mnt-by: DUMMY-MNT diff --git a/data/inetnum/172.23.138.0_23 b/data/inetnum/172.23.138.0_23 index b10e8b4fe..b78f0140b 100644 --- a/data/inetnum/172.23.138.0_23 +++ b/data/inetnum/172.23.138.0_23 @@ -7,6 +7,5 @@ tech-c: NAZCO-DN42 mnt-by: NAZCO-MNT nserver: ns1.nazco.dn42 status: ASSIGNED - bgp-status: active cidr: 172.23.138.0/23 diff --git a/data/inetnum/172.23.164.0_23 b/data/inetnum/172.23.164.0_23 index f48206e2a..d6eee43c8 100644 --- a/data/inetnum/172.23.164.0_23 +++ b/data/inetnum/172.23.164.0_23 @@ -1,10 +1,9 @@ inetnum: 172.23.164.0 - 172.23.165.255 netname: NICODUCK-DN42-v4 descr: nicos network -country: N/A admin-c: NICODUCK-DN42 tech-c: NICODUCK-DN42 mnt-by: NICODUCK-MNT status: ASSIGNED -bgp-status: active -cidr: 172.23.164.0/23 +bgp-status: active +cidr: 172.23.164.0/23 diff --git a/data/inetnum/172.23.241.0_24 b/data/inetnum/172.23.241.0_24 index 5906e1581..0266b0b36 100644 --- a/data/inetnum/172.23.241.0_24 +++ b/data/inetnum/172.23.241.0_24 @@ -2,12 +2,13 @@ inetnum: 172.23.241.0 - 172.23.241.255 nserver: ns.nicoo.dn42 netname: NICOO-DN42 descr: nicoo's dn42 network -remarks: This was allocated to connect several LANs, some of which won't -remarks: be in DN42 just yet (I need to physically go there) -country: FR, AT +remarks: This was allocated to connect several LANs, some of which won't +remarks: be in DN42 just yet (I need to physically go there) +country: FR +country: AT admin-c: NICOO-DN42 tech-c: NICOO-DN42 mnt-by: NICOO-MNT status: ALLOCATED -bgp-status: inactive 1496332803 +bgp-status: inactive 1496332803 cidr: 172.23.241.0/24 diff --git a/data/inetnum/172.23.242.0_24 b/data/inetnum/172.23.242.0_24 index ae3805464..d0af810ad 100644 --- a/data/inetnum/172.23.242.0_24 +++ b/data/inetnum/172.23.242.0_24 @@ -1,12 +1,13 @@ inetnum: 172.23.242.0 - 172.23.242.255 netname: NICOO-DN42-RSVR descr: nicoo's dn42 network -remarks: This is in case a single /24 isn't enough for 4 LANs -remarks: It is contiguous with 172.23.241.0/24 because I have little memory ;) -country: FR, AT +remarks: This is in case a single /24 isn't enough for 4 LANs +remarks: It is contiguous with 172.23.241.0/24 because I have little memory ;) +country: FR +country: AT admin-c: NICOO-DN42 tech-c: NICOO-DN42 mnt-by: NICOO-MNT status: RESERVED -bgp-status: inactive 1496332803 +bgp-status: inactive 1496332803 cidr: 172.23.242.0/24 diff --git a/data/inetnum/172.23.42.0_24 b/data/inetnum/172.23.42.0_24 new file mode 100644 index 000000000..6cd9dbe3b --- /dev/null +++ b/data/inetnum/172.23.42.0_24 @@ -0,0 +1,9 @@ +inetnum: 172.23.42.0 - 172.23.42.255 +cidr: 172.23.42.0/24 +descr: hexa +netname: HEXA-20171114 +admin-c: HEXA-DN42 +tech-c: HEXA-DN42 +mnt-by: HEXA-MNT +status: ALLOCATED +bgp-status: active diff --git a/data/mntner/GRMML-MNT b/data/mntner/GRMML-MNT index 1746f6ae4..de0c45a48 100644 --- a/data/mntner/GRMML-MNT +++ b/data/mntner/GRMML-MNT @@ -8,6 +8,7 @@ remarks: pin-sha256:CXs0ErFa+Vbrg6iMY3PiB+O1HAmkp4rDSXVzRySN5I8= remarks: pin-sha256:oTH4eWNEI1eRJBT4kgN0/reGnLuGpRFtdZ1M7Loipd0= remarks: pin-sha256:xu8VWxpzpuBgwcsmQn71MLih3d94glI50QotzoWax3A= remarks: pin-sha256:JSBEEUKnMbcrKqVSVXEdCG0khExigRPp4IpXAzULnSo= +remarks: pin-sha256:8Kz7eIOMvG7anXMxQzLZdwadgeUXsd9sKfNKv3mt0Rs= admin-c: GRMML-DN42 tech-c: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/mntner/OPTIC-MNT b/data/mntner/OPTIC-MNT index 329a4cff0..6d54cffdc 100644 --- a/data/mntner/OPTIC-MNT +++ b/data/mntner/OPTIC-MNT @@ -2,4 +2,4 @@ mntner: OPTIC-MNT descr: Optic Maintainer admin-c: OPTIC-DN42 tech-c: OPTIC-DN42 -mnt-by: OPTIC-MNT \ No newline at end of file +mnt-by: OPTIC-MNT diff --git a/data/mntner/UNGNT-MNT b/data/mntner/UNGNT-MNT index ea6bc4ddc..0935c2ccf 100644 --- a/data/mntner/UNGNT-MNT +++ b/data/mntner/UNGNT-MNT @@ -1,6 +1,6 @@ -mntner: UNGNT-MNT -descr: UNGNT Maintainer -remarks: ## ## -admin-c: UNGNT-DN42 -tech-c: UNGNT-DN42 -mnt-by: UNGNT-MNT \ No newline at end of file +mntner: UNGNT-MNT +descr: UNGNT Maintainer +remarks: ## ## +admin-c: UNGNT-DN42 +tech-c: UNGNT-DN42 +mnt-by: UNGNT-MNT diff --git a/data/mntner/UTLEYCCKS-MNT b/data/mntner/UTLEYCCKS-MNT index 51f1b42ae..5b5811af6 100644 --- a/data/mntner/UTLEYCCKS-MNT +++ b/data/mntner/UTLEYCCKS-MNT @@ -1,6 +1,6 @@ -mntner: UTLEYCCKS-MNT -descr: UTLEYCCKS Maintainer -remarks: ## ## -admin-c: JUTLEY-DN42 -tech-c: JUTLEY-DN42 -mnt-by: UTLEYCCKS-MNT +mntner: UTLEYCCKS-MNT +descr: UTLEYCCKS Maintainer +remarks: ## ## +admin-c: JUTLEY-DN42 +tech-c: JUTLEY-DN42 +mnt-by: UTLEYCCKS-MNT diff --git a/data/person/FXKR-DN42 b/data/person/FXKR-DN42 index be1ad4828..efd7bea7b 100644 --- a/data/person/FXKR-DN42 +++ b/data/person/FXKR-DN42 @@ -2,4 +2,3 @@ person: fxkr contact: mailto:felix.kaiser@fxkr.net nic-hdl: FXKR-DN42 mnt-by: FXKR-MNT - diff --git a/data/person/JUTLEY-DN42 b/data/person/JUTLEY-DN42 index 95de86518..774da8367 100644 --- a/data/person/JUTLEY-DN42 +++ b/data/person/JUTLEY-DN42 @@ -1,5 +1,5 @@ -person: Jeremy Utley -contact: jutley@utleycomputerconsulting.com -e-mail: jutley@utleycomputerconsulting.com -nic-hdl: JUTLEY-DN42 -mnt-by: UTLEYCCKS-MNT +person: Jeremy Utley +contact: jutley@utleycomputerconsulting.com +e-mail: jutley@utleycomputerconsulting.com +nic-hdl: JUTLEY-DN42 +mnt-by: UTLEYCCKS-MNT diff --git a/data/person/OPTIC-DN42 b/data/person/OPTIC-DN42 index 46c53ee02..015d3ad70 100644 --- a/data/person/OPTIC-DN42 +++ b/data/person/OPTIC-DN42 @@ -2,4 +2,4 @@ person: Optic contact: jabber: optic@jabber.de contact: irc: opti nic-hdl: OPTIC-DN42 -mnt-by: OPTIC-MNT \ No newline at end of file +mnt-by: OPTIC-MNT diff --git a/data/person/PYROPETER-DN42 b/data/person/PYROPETER-DN42 index a16ead96c..d24c1e448 100644 --- a/data/person/PYROPETER-DN42 +++ b/data/person/PYROPETER-DN42 @@ -1,5 +1,6 @@ person: PyroPeter contact: xmpp:pyropeter@jabber.ccchb.de contact: mail:pyropeter+dn42@pyropeter.eu +contact: ircs://irc.hackint.org:6697/#dn42 nic-hdl: PYROPETER-DN42 -mnt-by: DUMMY-MNT +mnt-by: PYROPETER-MNT diff --git a/data/person/RZL-DN42 b/data/person/RZL-DN42 index 0005f42b3..9cab3a07c 100644 --- a/data/person/RZL-DN42 +++ b/data/person/RZL-DN42 @@ -1,4 +1,3 @@ person: RZL nic-hdl: RZL-DN42 mnt-by: DUMMY-MNT - diff --git a/data/person/UNGNT-DN42 b/data/person/UNGNT-DN42 index 0f4966812..8939762ff 100644 --- a/data/person/UNGNT-DN42 +++ b/data/person/UNGNT-DN42 @@ -1,5 +1,5 @@ -person: TheRokh -contact: sam@ungnt.com -e-mail: sam@ungnt.com -nic-hdl: UNGNT-DN42 -mnt-by: UNGNT-MNT +person: TheRokh +contact: sam@ungnt.com +e-mail: sam@ungnt.com +nic-hdl: UNGNT-DN42 +mnt-by: UNGNT-MNT diff --git a/data/role/ALENAN-DN42 b/data/role/ALENAN-DN42 index 07d5d85cf..a3cff7909 100644 --- a/data/role/ALENAN-DN42 +++ b/data/role/ALENAN-DN42 @@ -5,4 +5,3 @@ admin-c: MUMU-DN42 tech-c: VMANN-DN42 tech-c: MUMU-DN42 mnt-by: VMANN-MNT - diff --git a/data/role/CCCKC-DN42 b/data/role/CCCKC-DN42 index 0f90f0830..29887c562 100644 --- a/data/role/CCCKC-DN42 +++ b/data/role/CCCKC-DN42 @@ -4,4 +4,3 @@ abuse-mailbox: networking@c3kc.org admin-c: TAGNO25-DN42 tech-c: TAGNO25-DN42 mnt-by: TAGNO25-MNT - diff --git a/data/role/ORG-YANE-DN42 b/data/role/ORG-YANE-DN42 index 75a17a3eb..c5316a0fb 100644 --- a/data/role/ORG-YANE-DN42 +++ b/data/role/ORG-YANE-DN42 @@ -4,4 +4,3 @@ descr: Virtual IXP for education purposes admin-c: XENTRIX-DN42 tech-c: XENTRIX-DN42 mnt-by: YANE-MNT - diff --git a/data/route/10.83.0.0_16 b/data/route/10.83.0.0_16 index 5599ed9a8..1b29138ef 100644 --- a/data/route/10.83.0.0_16 +++ b/data/route/10.83.0.0_16 @@ -4,4 +4,3 @@ origin: AS4242422950 mnt-by: SIS-ORG-MNT tech-c: CR-DN42 bgp-status: active - diff --git a/data/route/172.20.13.160_27 b/data/route/172.20.13.160_27 index d96da4822..8f99cd988 100644 --- a/data/route/172.20.13.160_27 +++ b/data/route/172.20.13.160_27 @@ -1,4 +1,4 @@ route: 172.20.13.160/27 origin: AS4242423472 mnt-by: OPTIC-MNT -bgp-status: active \ No newline at end of file +bgp-status: active diff --git a/data/route/172.21.101.128_27 b/data/route/172.21.101.128_27 index a96143cda..835d9b28a 100644 --- a/data/route/172.21.101.128_27 +++ b/data/route/172.21.101.128_27 @@ -1,4 +1,4 @@ route: 172.21.101.128/27 origin: AS4242423641 mnt-by: HESSENET-MNT -bgp-status: active \ No newline at end of file +bgp-status: active diff --git a/data/route/172.21.125.64_27 b/data/route/172.21.125.64_27 index c52cd2f84..6205d4e8d 100644 --- a/data/route/172.21.125.64_27 +++ b/data/route/172.21.125.64_27 @@ -1,4 +1,4 @@ route: 172.21.125.64/27 origin: AS4242423650 mnt-by: UNGNT-MNT -bgp-status: active \ No newline at end of file +bgp-status: active diff --git a/data/route/172.22.1.0_24 b/data/route/172.22.1.0_24 index 0aa540466..243d58e13 100644 --- a/data/route/172.22.1.0_24 +++ b/data/route/172.22.1.0_24 @@ -2,4 +2,3 @@ route: 172.22.1.0/24 origin: AS64712 mnt-by: FRITZ-MNT bgp-status: active - diff --git a/data/route/172.22.41.240_28 b/data/route/172.22.41.240_28 index ffc83ed51..25c364af2 100644 --- a/data/route/172.22.41.240_28 +++ b/data/route/172.22.41.240_28 @@ -1,4 +1,5 @@ route: 172.22.41.240/28 origin: AS76115 +origin: AS4242420000 mnt-by: PYROPETER-MNT bgp-status: active diff --git a/data/route/172.23.0.80_28 b/data/route/172.23.0.80_32 similarity index 88% rename from data/route/172.23.0.80_28 rename to data/route/172.23.0.80_32 index f3db3a130..4f5877e1f 100644 --- a/data/route/172.23.0.80_28 +++ b/data/route/172.23.0.80_32 @@ -1,4 +1,4 @@ -route: 172.23.0.80/28 +route: 172.23.0.80/32 descr: dn42 wiki anycast origin: AS4242420122 origin: AS64737 diff --git a/data/route/172.23.138.0_23 b/data/route/172.23.138.0_23 index 51f0e1ef0..d22771e5a 100644 --- a/data/route/172.23.138.0_23 +++ b/data/route/172.23.138.0_23 @@ -1,6 +1,5 @@ route: 172.23.138.0/23 descr: nazco's network origin: AS76118 - bgp-status: active mnt-by: DUMMY-MNT diff --git a/data/route/172.23.196.0_24 b/data/route/172.23.196.0_24 index 09140afc1..fb04fb3b4 100644 --- a/data/route/172.23.196.0_24 +++ b/data/route/172.23.196.0_24 @@ -1,4 +1,5 @@ route: 172.23.196.0/24 origin: AS76115 +origin: AS4242420000 mnt-by: PYROPETER-MNT bgp-status: active diff --git a/data/route/172.23.202.0_24 b/data/route/172.23.202.0_24 index 4c75bf4a7..42a371904 100644 --- a/data/route/172.23.202.0_24 +++ b/data/route/172.23.202.0_24 @@ -1,4 +1,5 @@ route: 172.23.202.0/24 origin: AS76115 +origin: AS4242420000 mnt-by: PYROPETER-MNT bgp-status: active diff --git a/data/route/172.23.42.0_24 b/data/route/172.23.42.0_24 index 1a8a0846b..6c9307c14 100644 --- a/data/route/172.23.42.0_24 +++ b/data/route/172.23.42.0_24 @@ -1,4 +1,5 @@ route: 172.23.42.0/24 origin: AS64600 +origin: AS4242420101 mnt-by: HEXA-MNT bgp-status: inactive 1490155205 diff --git a/data/route6/fd42:23:42::_48 b/data/route6/fd42:23:42::_48 new file mode 100644 index 000000000..7c3e18931 --- /dev/null +++ b/data/route6/fd42:23:42::_48 @@ -0,0 +1,5 @@ +route: fd42:23:42::/48 +origin: AS64600 +origin: AS4242420101 +mnt-by: HEXA-MNT +bgp-status: inactive 1490155205 diff --git a/data/route6/fda1:d26b:7461::_48 b/data/route6/fda1:d26b:7461::_48 index 8612cea29..16aac508b 100644 --- a/data/route6/fda1:d26b:7461::_48 +++ b/data/route6/fda1:d26b:7461::_48 @@ -1,3 +1,4 @@ route6: fda1:d26b:7461::/48 origin: AS76115 +origin: AS4242420000 mnt-by: PYROPETER-MNT diff --git a/data/tinc-key/DEFIANTPORT2-TINC b/data/tinc-key/DEFIANTPORT2-TINC index b47d5ca37..b22c2f085 100644 --- a/data/tinc-key/DEFIANTPORT2-TINC +++ b/data/tinc-key/DEFIANTPORT2-TINC @@ -15,4 +15,4 @@ tinc-file: 3SFgXGESmJcqQEp7EZdOQXBMBX29496QvF9ket+AIplDbe9q8DC6EcRRH3Lahq4Y GSrO9t7mKa6yEtLDBFbqKDAgwgsxh4l9EDqrMwIVSYbfcWLYgNIOpEsCAwEAAQ== -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT diff --git a/data/tinc-key/DODGER78-TINC b/data/tinc-key/DODGER78-TINC index fcd8a49e9..cc775790e 100644 --- a/data/tinc-key/DODGER78-TINC +++ b/data/tinc-key/DODGER78-TINC @@ -13,4 +13,4 @@ tinc-file: Stos+m7zfQWEJ6rHSq1Ut93jBlKlzwBle5qEmvH/whJ5cZC18LWPA6NynF0Ioel+ 8GFqt0vRQcyd/kDUz0uEnDcESUGTNswsRwIDAQAB -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT diff --git a/data/tinc-key/DOWNHILL-TINC b/data/tinc-key/DOWNHILL-TINC index c682d06d0..b660ed40e 100644 --- a/data/tinc-key/DOWNHILL-TINC +++ b/data/tinc-key/DOWNHILL-TINC @@ -12,4 +12,4 @@ tinc-file: SE/IxPDoJ+Bp3IjlAaWKlVXptxVnMR41/t/aNYGlsOcwBr7gRZZExkG7wvKtWdYp 4gWeRTqvWhiwt+T0OoFFZM0D1X4sS6/A1QIDAQAB -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT diff --git a/data/tinc-key/FISHYSNAX-TINC b/data/tinc-key/FISHYSNAX-TINC index f41c92a99..beba18ab3 100644 --- a/data/tinc-key/FISHYSNAX-TINC +++ b/data/tinc-key/FISHYSNAX-TINC @@ -16,4 +16,4 @@ tinc-file: ei92e7UVwT3+OOudqsOfOXa2IWtIXBtjRzkMeehUDkRGF8DzamqOUE1+DvW2esiN Zv/yyBf2r53lBrCd3pPxF6cw9hVr4XzmD68/TVfdMfJCVTzfom9AO5UCAwEAAQ== -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT diff --git a/data/tinc-key/MERLIN-TINC b/data/tinc-key/MERLIN-TINC index 64179bed9..8f2d3724e 100644 --- a/data/tinc-key/MERLIN-TINC +++ b/data/tinc-key/MERLIN-TINC @@ -13,4 +13,4 @@ tinc-file: 2Vvm0Eg8Si1M+CfzBityH6mauBE/epLhOAd+pEpYQL420TVUUrcxOlU8y6PPCJLv NcXVJk3DURkAkcHMzM/sbVyHs/VSUg0VowIDAQAB -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT diff --git a/data/tinc-key/MNL-TINC b/data/tinc-key/MNL-TINC index 51bf9457b..fc8f4e143 100644 --- a/data/tinc-key/MNL-TINC +++ b/data/tinc-key/MNL-TINC @@ -11,4 +11,4 @@ tinc-file: Z72puZHbv0dhlgNmJYKmp2bhiHCS1YziKretnPedeK0XRFC/O8bccNKzwcG27lwK umnknTN93qyuSjAv1EoDJSHenY6Gm9E7Tgysn4mSLcK3l5yeA1/JAgMBAAE= -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT diff --git a/data/tinc-key/NULLL-TINC b/data/tinc-key/NULLL-TINC index 4d3cd9fd5..47a449a97 100644 --- a/data/tinc-key/NULLL-TINC +++ b/data/tinc-key/NULLL-TINC @@ -19,4 +19,4 @@ tinc-file: zjLbQ09udelC87eEvBL6kLb1420blMLz7M92Si/ErEr8GbSGqo34GUx4n14fv8bQ XEIftMFZXQzZaAyBYYlXFX5OIDsJKA0pGedJFn1pnc5nuyj6fXCHxAjBFqC6/Odb dAuG0GNchC0Y3JHQf0ktoDfWPUGqSR+EPQIDAQAB - -----END RSA PUBLIC KEY----- \ No newline at end of file + -----END RSA PUBLIC KEY----- diff --git a/data/tinc-key/PETRUS-TINC b/data/tinc-key/PETRUS-TINC index f59c5aa90..d1d23b05c 100644 --- a/data/tinc-key/PETRUS-TINC +++ b/data/tinc-key/PETRUS-TINC @@ -14,4 +14,4 @@ tinc-file: ECDSAPublicKey = CAQ9URkmcVYW7pJ0yHIk83uv1hgH+4RPcdGvWKsIH2wTkRGgmy0mMm4i90K07g3M8pFL1MB6nEr94R8+4qyhg9VZDB Address = poum.tk Port = 23752 -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT diff --git a/data/tinc-key/SCHRODINGER-TINC b/data/tinc-key/SCHRODINGER-TINC index a63129802..708843b05 100644 --- a/data/tinc-key/SCHRODINGER-TINC +++ b/data/tinc-key/SCHRODINGER-TINC @@ -12,4 +12,4 @@ tinc-file: DrhfXJguRMdCVWz5iQdRv++E5+Ln8oCmYUwyPeq2RruaJVUuf6COI3sUuiootXln oQ6lXxk7Pk+4I2BUnAJTQxCHHMsYuOQeKwIDAQAB -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT diff --git a/data/tinc-key/UFO-TINC b/data/tinc-key/UFO-TINC index 686c3bd40..d3cb2c09c 100644 --- a/data/tinc-key/UFO-TINC +++ b/data/tinc-key/UFO-TINC @@ -4,7 +4,6 @@ tinc-file: Subnet = 172.22.255.183 Address = AnoRtr.UFO-Net.nl Port = 659 - -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAq2cggqGKw8nX8dg07/XejASCHZkjL81reFjRF5Y7wWDh+9T8upyX t/+VAnylr8vvXyVSZ2J0an1nva3OWh8tzRanDGR2grrXJcrpZeVSRJhzyHqkAMJb @@ -13,4 +12,4 @@ tinc-file: Cn6hGnKDWlXfm3xaOzd4Tua5xN7FZMinLPa9CgvbMOCVO89r7F0u3rePKAlFp6vQ qJDYE3LFROC/7A+so1Aab89eH955JffPVwIDAQAB -----END RSA PUBLIC KEY----- -mnt-by: DUMMY-MNT \ No newline at end of file +mnt-by: DUMMY-MNT