From 35723112c94f7b2a5bbd4d2ece5a95aaca231669 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Sun, 9 Jun 2019 02:05:20 +0200 Subject: [PATCH 01/16] Adding CookieFactory/Hyp3rX Objects --- data/aut-num/AS4242421860 | 7 +++++++ data/inetnum/172.22.183.0_24 | 10 ++++++++++ data/mntner/COOKIEFACTORY-MNT | 5 +++++ data/organisation/ORG-COOKIEFACTORY | 6 ++++++ data/person/Hyp3rX-DN42 | 5 +++++ data/route/172.22.183.0_24 | 4 ++++ 6 files changed, 37 insertions(+) create mode 100644 data/aut-num/AS4242421860 create mode 100644 data/inetnum/172.22.183.0_24 create mode 100644 data/mntner/COOKIEFACTORY-MNT create mode 100644 data/organisation/ORG-COOKIEFACTORY create mode 100644 data/person/Hyp3rX-DN42 create mode 100644 data/route/172.22.183.0_24 diff --git a/data/aut-num/AS4242421860 b/data/aut-num/AS4242421860 new file mode 100644 index 000000000..b79f8ec7a --- /dev/null +++ b/data/aut-num/AS4242421860 @@ -0,0 +1,7 @@ +aut-num: AS4242421860 +as-name: CookieFactory-DUS1-AS +descr: CookieFactory DUS1 (Myloc) ASN +admin-c: Hyp3rX-DN42 +tech-c: Hyp3rX-DN42 +mnt-by: CookieFactory-MNT +source: DN42 diff --git a/data/inetnum/172.22.183.0_24 b/data/inetnum/172.22.183.0_24 new file mode 100644 index 000000000..d474ea7dd --- /dev/null +++ b/data/inetnum/172.22.183.0_24 @@ -0,0 +1,10 @@ +inetnum: 172.22.183.0 - 172.22.183.255 +cidr: 172.22.183.0/24 +netname: COOKIE-NETWORK +admin-c: Hyp3rX-DN42 +tech-c: Hyp3rX-DN42 +mnt-by: Hyp3rX-MNT +nserver: ns1.cookie-factory.dn42 +nserver: ns2.cookie-factory.dn42 +status: ASSIGNED +source: DN42 \ No newline at end of file diff --git a/data/mntner/COOKIEFACTORY-MNT b/data/mntner/COOKIEFACTORY-MNT new file mode 100644 index 000000000..a2e36a1b7 --- /dev/null +++ b/data/mntner/COOKIEFACTORY-MNT @@ -0,0 +1,5 @@ +mntner: COOKIEFACTORY-MNT +admin-c: Hyp3rX-DN42 +tech-c: Hyp3rX-DN42 +mnt-by: COOKIEFACTORY-MNT +source: DN42 diff --git a/data/organisation/ORG-COOKIEFACTORY b/data/organisation/ORG-COOKIEFACTORY new file mode 100644 index 000000000..04d1f0ddd --- /dev/null +++ b/data/organisation/ORG-COOKIEFACTORY @@ -0,0 +1,6 @@ +organisation: ORG-COOKIEFACTORY +org-name: Cookie Factory +admin-c: Hyp3rX-DN42 +tech-c: Hyp3rX-DN42 +mnt-by: COOKIEFACTORY-MNT +source: DN42 diff --git a/data/person/Hyp3rX-DN42 b/data/person/Hyp3rX-DN42 new file mode 100644 index 000000000..4d82ebf53 --- /dev/null +++ b/data/person/Hyp3rX-DN42 @@ -0,0 +1,5 @@ +person: Timo Pollmeier +contact: community@cookie-factory.eu +nic-hdl: Hyp3rX-DN42 +mnt-by: COOKIEFACTORY-MNT +source: DN42 diff --git a/data/route/172.22.183.0_24 b/data/route/172.22.183.0_24 new file mode 100644 index 000000000..949cf5dcf --- /dev/null +++ b/data/route/172.22.183.0_24 @@ -0,0 +1,4 @@ +route: 172.22.183.0/24 +origin: AS4242421860 +mnt-by: COOKIEFACTORY-MNT +source: DN42 From 405b97dc40b2050fbf9e1887d222423de48e3a96 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Sun, 9 Jun 2019 02:50:58 +0200 Subject: [PATCH 02/16] Fix Schema Checker --- data/aut-num/AS4242421860 | 4 ++-- data/inetnum/172.22.183.0_24 | 6 +++--- data/mntner/COOKIEFACTORY-MNT | 4 ++-- data/organisation/ORG-COOKIEFACTORY | 12 ++++++------ data/person/{Hyp3rX-DN42 => HYP3RX-DN42} | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) rename data/person/{Hyp3rX-DN42 => HYP3RX-DN42} (67%) diff --git a/data/aut-num/AS4242421860 b/data/aut-num/AS4242421860 index b79f8ec7a..7fcef984a 100644 --- a/data/aut-num/AS4242421860 +++ b/data/aut-num/AS4242421860 @@ -1,7 +1,7 @@ aut-num: AS4242421860 as-name: CookieFactory-DUS1-AS descr: CookieFactory DUS1 (Myloc) ASN -admin-c: Hyp3rX-DN42 -tech-c: Hyp3rX-DN42 +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 mnt-by: CookieFactory-MNT source: DN42 diff --git a/data/inetnum/172.22.183.0_24 b/data/inetnum/172.22.183.0_24 index d474ea7dd..a019a0b81 100644 --- a/data/inetnum/172.22.183.0_24 +++ b/data/inetnum/172.22.183.0_24 @@ -1,9 +1,9 @@ inetnum: 172.22.183.0 - 172.22.183.255 cidr: 172.22.183.0/24 netname: COOKIE-NETWORK -admin-c: Hyp3rX-DN42 -tech-c: Hyp3rX-DN42 -mnt-by: Hyp3rX-MNT +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: HYP3RX-MNT nserver: ns1.cookie-factory.dn42 nserver: ns2.cookie-factory.dn42 status: ASSIGNED diff --git a/data/mntner/COOKIEFACTORY-MNT b/data/mntner/COOKIEFACTORY-MNT index a2e36a1b7..006fcd6fb 100644 --- a/data/mntner/COOKIEFACTORY-MNT +++ b/data/mntner/COOKIEFACTORY-MNT @@ -1,5 +1,5 @@ mntner: COOKIEFACTORY-MNT -admin-c: Hyp3rX-DN42 -tech-c: Hyp3rX-DN42 +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT source: DN42 diff --git a/data/organisation/ORG-COOKIEFACTORY b/data/organisation/ORG-COOKIEFACTORY index 04d1f0ddd..312ee6ffd 100644 --- a/data/organisation/ORG-COOKIEFACTORY +++ b/data/organisation/ORG-COOKIEFACTORY @@ -1,6 +1,6 @@ -organisation: ORG-COOKIEFACTORY -org-name: Cookie Factory -admin-c: Hyp3rX-DN42 -tech-c: Hyp3rX-DN42 -mnt-by: COOKIEFACTORY-MNT -source: DN42 +organisation: ORG-COOKIEFACTORY +org-name: Cookie Factory +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +source: DN42 \ No newline at end of file diff --git a/data/person/Hyp3rX-DN42 b/data/person/HYP3RX-DN42 similarity index 67% rename from data/person/Hyp3rX-DN42 rename to data/person/HYP3RX-DN42 index 4d82ebf53..eee5aa474 100644 --- a/data/person/Hyp3rX-DN42 +++ b/data/person/HYP3RX-DN42 @@ -1,5 +1,5 @@ person: Timo Pollmeier contact: community@cookie-factory.eu -nic-hdl: Hyp3rX-DN42 +nic-hdl: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT -source: DN42 +source: DN42 \ No newline at end of file From e1714d34c401ca507eb6c013006a06177cc78467 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Sun, 9 Jun 2019 02:53:02 +0200 Subject: [PATCH 03/16] Fix schema Checker - ASN MNT BY --- data/aut-num/AS4242421860 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/aut-num/AS4242421860 b/data/aut-num/AS4242421860 index 7fcef984a..405494708 100644 --- a/data/aut-num/AS4242421860 +++ b/data/aut-num/AS4242421860 @@ -3,5 +3,5 @@ as-name: CookieFactory-DUS1-AS descr: CookieFactory DUS1 (Myloc) ASN admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 -mnt-by: CookieFactory-MNT +mnt-by: COOKIEFACTORY-MNT source: DN42 From 709b25fad56171b2252791b7345c5dbe308df235 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Sun, 9 Jun 2019 03:02:54 +0200 Subject: [PATCH 04/16] maby Fix schema Checker - Lookup of key mnt-by failed. Object HYP3RX-MNT of reference class dn42.mntner was not found. --- data/aut-num/AS4242421860 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/aut-num/AS4242421860 b/data/aut-num/AS4242421860 index 405494708..b0d57b070 100644 --- a/data/aut-num/AS4242421860 +++ b/data/aut-num/AS4242421860 @@ -1,6 +1,6 @@ aut-num: AS4242421860 as-name: CookieFactory-DUS1-AS -descr: CookieFactory DUS1 (Myloc) ASN +descr: CookieFactory DUS1 (Myloc) AS#1 admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT From 3b46ee371d34203f08a67e2ef747b26dc3584229 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Sun, 9 Jun 2019 03:03:15 +0200 Subject: [PATCH 05/16] maby Fix schema Checker - Lookup of key mnt-by failed. Object HYP3RX-MNT of reference class dn42.mntner was not found. Signed-off-by: Timo Pollmeier --- data/inetnum/172.22.183.0_24 | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/inetnum/172.22.183.0_24 b/data/inetnum/172.22.183.0_24 index a019a0b81..6fe26391e 100644 --- a/data/inetnum/172.22.183.0_24 +++ b/data/inetnum/172.22.183.0_24 @@ -4,7 +4,5 @@ netname: COOKIE-NETWORK admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 mnt-by: HYP3RX-MNT -nserver: ns1.cookie-factory.dn42 -nserver: ns2.cookie-factory.dn42 status: ASSIGNED source: DN42 \ No newline at end of file From 3f38f7edb28132fdc2aec9e75ede10e75a4746a4 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Sun, 9 Jun 2019 03:15:00 +0200 Subject: [PATCH 06/16] Fix schema Checker - Lookup of key mnt-by failed. Object HYP3RX-MNT of reference class dn42.mntner was not found. Signed-off-by: Timo Pollmeier --- data/inetnum/172.22.183.0_24 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/inetnum/172.22.183.0_24 b/data/inetnum/172.22.183.0_24 index 6fe26391e..a31e7f921 100644 --- a/data/inetnum/172.22.183.0_24 +++ b/data/inetnum/172.22.183.0_24 @@ -3,6 +3,6 @@ cidr: 172.22.183.0/24 netname: COOKIE-NETWORK admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 -mnt-by: HYP3RX-MNT +mnt-by: COOKIEFACTORY-MNT status: ASSIGNED source: DN42 \ No newline at end of file From a46f8429cbe33d46b73b25cb82031322f0b7fe10 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Sun, 9 Jun 2019 03:21:30 +0200 Subject: [PATCH 07/16] Pre adding DNS Servers Signed-off-by: Timo Pollmeier --- data/dns/cookie-factory.dn42 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 data/dns/cookie-factory.dn42 diff --git a/data/dns/cookie-factory.dn42 b/data/dns/cookie-factory.dn42 new file mode 100644 index 000000000..c17a48b0e --- /dev/null +++ b/data/dns/cookie-factory.dn42 @@ -0,0 +1,9 @@ +domain: cookie-factory.dn42 +descr: DNS PROJECT +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +nserver: ns1.cookie-factory.dn42 172.22.188.2 +nserver: ns2.cookie-factory.dn42 172.22.188.3 +remarks: DNS hosted by Cookie-Factory.dn42 +source: DN42 \ No newline at end of file From 44432015a7d35812d11fd1332224eb9da3787c09 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Sun, 9 Jun 2019 12:42:05 +0200 Subject: [PATCH 08/16] Adding AS4242421861 Signed-off-by: Timo Pollmeier --- data/aut-num/AS4242421861 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/aut-num/AS4242421861 diff --git a/data/aut-num/AS4242421861 b/data/aut-num/AS4242421861 new file mode 100644 index 000000000..f3707e2ad --- /dev/null +++ b/data/aut-num/AS4242421861 @@ -0,0 +1,7 @@ +aut-num: AS4242421861 +as-name: CookieFactory-BI1-AS +descr: CookieFactory BI1 (Bielefeld) AS#1 +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +source: DN42 From dc4601840e2a05f37c13179aba55fa6be8a61f05 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 10 Jun 2019 13:37:03 +0200 Subject: [PATCH 09/16] Change ipnet to /28 and assign ipv6net /48 Signed-off-by: Timo Pollmeier --- data/aut-num/AS4242421860 | 4 ++-- data/aut-num/AS4242421861 | 7 ------- data/inet6num/fd6b:869c:c4a1::_48 | 11 +++++++++++ data/inetnum/{172.22.183.0_24 => 172.20.6.160_28} | 4 ++-- data/route/{172.22.183.0_24 => 172.22.183.160_28} | 2 +- data/route6/fd6b:869c:c4a1::_48 | 5 +++++ 6 files changed, 21 insertions(+), 12 deletions(-) delete mode 100644 data/aut-num/AS4242421861 create mode 100644 data/inet6num/fd6b:869c:c4a1::_48 rename data/inetnum/{172.22.183.0_24 => 172.20.6.160_28} (66%) rename data/route/{172.22.183.0_24 => 172.22.183.160_28} (71%) create mode 100644 data/route6/fd6b:869c:c4a1::_48 diff --git a/data/aut-num/AS4242421860 b/data/aut-num/AS4242421860 index b0d57b070..e7a38cffd 100644 --- a/data/aut-num/AS4242421860 +++ b/data/aut-num/AS4242421860 @@ -1,6 +1,6 @@ aut-num: AS4242421860 -as-name: CookieFactory-DUS1-AS -descr: CookieFactory DUS1 (Myloc) AS#1 +as-name: CookieFactory-AS +descr: CookieFactory Autonomes admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT diff --git a/data/aut-num/AS4242421861 b/data/aut-num/AS4242421861 deleted file mode 100644 index f3707e2ad..000000000 --- a/data/aut-num/AS4242421861 +++ /dev/null @@ -1,7 +0,0 @@ -aut-num: AS4242421861 -as-name: CookieFactory-BI1-AS -descr: CookieFactory BI1 (Bielefeld) AS#1 -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -source: DN42 diff --git a/data/inet6num/fd6b:869c:c4a1::_48 b/data/inet6num/fd6b:869c:c4a1::_48 new file mode 100644 index 000000000..832b59082 --- /dev/null +++ b/data/inet6num/fd6b:869c:c4a1::_48 @@ -0,0 +1,11 @@ +inet6num: fd6b:869c:c4a1:0000:0000:0000:0000:0000 - fd6b:869c:c4a1:ffff:ffff:ffff:ffff:ffff +netname: COOKIEFACTORY-NET6 +cidr: fd6b:869c:c4a1::/48 +descr: CookieFactory's IPv6 network +country: DE +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ASSIGNED +org: ORG-COOKIEFACTORY +source: DN42 \ No newline at end of file diff --git a/data/inetnum/172.22.183.0_24 b/data/inetnum/172.20.6.160_28 similarity index 66% rename from data/inetnum/172.22.183.0_24 rename to data/inetnum/172.20.6.160_28 index a31e7f921..ba51c9562 100644 --- a/data/inetnum/172.22.183.0_24 +++ b/data/inetnum/172.20.6.160_28 @@ -1,5 +1,5 @@ -inetnum: 172.22.183.0 - 172.22.183.255 -cidr: 172.22.183.0/24 +inetnum: 172.22.183.160 - 172.22.183.175 +cidr: 172.22.183.160/28 netname: COOKIE-NETWORK admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 diff --git a/data/route/172.22.183.0_24 b/data/route/172.22.183.160_28 similarity index 71% rename from data/route/172.22.183.0_24 rename to data/route/172.22.183.160_28 index 949cf5dcf..2203423cf 100644 --- a/data/route/172.22.183.0_24 +++ b/data/route/172.22.183.160_28 @@ -1,4 +1,4 @@ -route: 172.22.183.0/24 +route: 172.22.183.160/28 origin: AS4242421860 mnt-by: COOKIEFACTORY-MNT source: DN42 diff --git a/data/route6/fd6b:869c:c4a1::_48 b/data/route6/fd6b:869c:c4a1::_48 new file mode 100644 index 000000000..fa584b2fb --- /dev/null +++ b/data/route6/fd6b:869c:c4a1::_48 @@ -0,0 +1,5 @@ +route6: fd6b:869c:c4a1::/48 +descr: CookieFactory's IPv6 network +origin: AS4242421860 +mnt-by: COOKIEFACTORY-MNT +source: DN42 From 295444f4cd98efb2b567726ca7986048daee5b0a Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 10 Jun 2019 13:43:00 +0200 Subject: [PATCH 10/16] fix route object Signed-off-by: Timo Pollmeier --- data/inetnum/172.20.6.160_28 | 4 ++-- data/route/{172.22.183.160_28 => 172.20.6.160_28} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename data/route/{172.22.183.160_28 => 172.20.6.160_28} (71%) diff --git a/data/inetnum/172.20.6.160_28 b/data/inetnum/172.20.6.160_28 index ba51c9562..1d995ba67 100644 --- a/data/inetnum/172.20.6.160_28 +++ b/data/inetnum/172.20.6.160_28 @@ -1,5 +1,5 @@ -inetnum: 172.22.183.160 - 172.22.183.175 -cidr: 172.22.183.160/28 +inetnum: 172.20.6.160 - 172.20.6.175 +cidr: 172.20.6.160/28 netname: COOKIE-NETWORK admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 diff --git a/data/route/172.22.183.160_28 b/data/route/172.20.6.160_28 similarity index 71% rename from data/route/172.22.183.160_28 rename to data/route/172.20.6.160_28 index 2203423cf..125494ae6 100644 --- a/data/route/172.22.183.160_28 +++ b/data/route/172.20.6.160_28 @@ -1,4 +1,4 @@ -route: 172.22.183.160/28 +route: 172.20.6.160/28 origin: AS4242421860 mnt-by: COOKIEFACTORY-MNT source: DN42 From 4be5a7699c57fe2bd8edc3d9af071db9f0be986f Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 10 Jun 2019 14:22:50 +0200 Subject: [PATCH 11/16] add pgpfingerprint to COOKIEFACTORY-MNT Signed-off-by: Timo Pollmeier --- data/aut-num/AS4242421860 | 14 +++++++------- data/dns/cookie-factory.dn42 | 18 +++++++++--------- data/inet6num/fd6b:869c:c4a1::_48 | 22 +++++++++++----------- data/inetnum/172.20.6.160_28 | 16 ++++++++-------- data/organisation/ORG-COOKIEFACTORY | 12 ++++++------ data/person/HYP3RX-DN42 | 2 +- data/route6/fd6b:869c:c4a1::_48 | 10 +++++----- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/data/aut-num/AS4242421860 b/data/aut-num/AS4242421860 index e7a38cffd..64ab2b1d3 100644 --- a/data/aut-num/AS4242421860 +++ b/data/aut-num/AS4242421860 @@ -1,7 +1,7 @@ -aut-num: AS4242421860 -as-name: CookieFactory-AS -descr: CookieFactory Autonomes -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -source: DN42 +aut-num: AS4242421860 +as-name: CookieFactory-AS +descr: CookieFactory Autonomes +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +source: DN42 diff --git a/data/dns/cookie-factory.dn42 b/data/dns/cookie-factory.dn42 index c17a48b0e..661469cc0 100644 --- a/data/dns/cookie-factory.dn42 +++ b/data/dns/cookie-factory.dn42 @@ -1,9 +1,9 @@ -domain: cookie-factory.dn42 -descr: DNS PROJECT -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -nserver: ns1.cookie-factory.dn42 172.22.188.2 -nserver: ns2.cookie-factory.dn42 172.22.188.3 -remarks: DNS hosted by Cookie-Factory.dn42 -source: DN42 \ No newline at end of file +domain: cookie-factory.dn42 +descr: DNS PROJECT +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +nserver: ns1.cookie-factory.dn42 172.22.188.2 +nserver: ns2.cookie-factory.dn42 172.22.188.3 +remarks: DNS hosted by Cookie-Factory.dn42 +source: DN42 diff --git a/data/inet6num/fd6b:869c:c4a1::_48 b/data/inet6num/fd6b:869c:c4a1::_48 index 832b59082..78bafe113 100644 --- a/data/inet6num/fd6b:869c:c4a1::_48 +++ b/data/inet6num/fd6b:869c:c4a1::_48 @@ -1,11 +1,11 @@ -inet6num: fd6b:869c:c4a1:0000:0000:0000:0000:0000 - fd6b:869c:c4a1:ffff:ffff:ffff:ffff:ffff -netname: COOKIEFACTORY-NET6 -cidr: fd6b:869c:c4a1::/48 -descr: CookieFactory's IPv6 network -country: DE -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -status: ASSIGNED -org: ORG-COOKIEFACTORY -source: DN42 \ No newline at end of file +inet6num: fd6b:869c:c4a1:0000:0000:0000:0000:0000 - fd6b:869c:c4a1:ffff:ffff:ffff:ffff:ffff +netname: COOKIEFACTORY-NET6 +cidr: fd6b:869c:c4a1::/48 +descr: CookieFactory's IPv6 network +country: DE +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ASSIGNED +org: ORG-COOKIEFACTORY +source: DN42 diff --git a/data/inetnum/172.20.6.160_28 b/data/inetnum/172.20.6.160_28 index 1d995ba67..86c232e7e 100644 --- a/data/inetnum/172.20.6.160_28 +++ b/data/inetnum/172.20.6.160_28 @@ -1,8 +1,8 @@ -inetnum: 172.20.6.160 - 172.20.6.175 -cidr: 172.20.6.160/28 -netname: COOKIE-NETWORK -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -status: ASSIGNED -source: DN42 \ No newline at end of file +inetnum: 172.20.6.160 - 172.20.6.175 +cidr: 172.20.6.160/28 +netname: COOKIE-NETWORK +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ASSIGNED +source: DN42 diff --git a/data/organisation/ORG-COOKIEFACTORY b/data/organisation/ORG-COOKIEFACTORY index 312ee6ffd..279db1bf7 100644 --- a/data/organisation/ORG-COOKIEFACTORY +++ b/data/organisation/ORG-COOKIEFACTORY @@ -1,6 +1,6 @@ -organisation: ORG-COOKIEFACTORY -org-name: Cookie Factory -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -source: DN42 \ No newline at end of file +organisation: ORG-COOKIEFACTORY +org-name: Cookie Factory +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +source: DN42 diff --git a/data/person/HYP3RX-DN42 b/data/person/HYP3RX-DN42 index eee5aa474..9075e5490 100644 --- a/data/person/HYP3RX-DN42 +++ b/data/person/HYP3RX-DN42 @@ -2,4 +2,4 @@ person: Timo Pollmeier contact: community@cookie-factory.eu nic-hdl: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT -source: DN42 \ No newline at end of file +source: DN42 diff --git a/data/route6/fd6b:869c:c4a1::_48 b/data/route6/fd6b:869c:c4a1::_48 index fa584b2fb..e8ea057f5 100644 --- a/data/route6/fd6b:869c:c4a1::_48 +++ b/data/route6/fd6b:869c:c4a1::_48 @@ -1,5 +1,5 @@ -route6: fd6b:869c:c4a1::/48 -descr: CookieFactory's IPv6 network -origin: AS4242421860 -mnt-by: COOKIEFACTORY-MNT -source: DN42 +route6: fd6b:869c:c4a1::/48 +descr: CookieFactory's IPv6 network +origin: AS4242421860 +mnt-by: COOKIEFACTORY-MNT +source: DN42 From 4a0d1bc1d2cadf7091090d42612daac150cb8bfd Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 10 Jun 2019 14:51:09 +0200 Subject: [PATCH 12/16] Allocate 172.20.6.160/27 to CookieFactory Signed-off-by: Timo Pollmeier --- data/inetnum/172.20.6.160_27 | 8 ++++++++ data/inetnum/172.20.6.176_28 | 8 ++++++++ data/mntner/COOKIEFACTORY-MNT | 1 + data/route/172.20.6.160_27 | 4 ++++ data/route/172.20.6.176_28 | 4 ++++ 5 files changed, 25 insertions(+) create mode 100644 data/inetnum/172.20.6.160_27 create mode 100644 data/inetnum/172.20.6.176_28 create mode 100644 data/route/172.20.6.160_27 create mode 100644 data/route/172.20.6.176_28 diff --git a/data/inetnum/172.20.6.160_27 b/data/inetnum/172.20.6.160_27 new file mode 100644 index 000000000..27701cf62 --- /dev/null +++ b/data/inetnum/172.20.6.160_27 @@ -0,0 +1,8 @@ +inetnum: 172.20.6.160 - 172.20.6.191 +cidr: 172.20.6.160/27 +netname: COOKIE-NETWORK +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ALLOCATED +source: DN42 diff --git a/data/inetnum/172.20.6.176_28 b/data/inetnum/172.20.6.176_28 new file mode 100644 index 000000000..7c07fc04f --- /dev/null +++ b/data/inetnum/172.20.6.176_28 @@ -0,0 +1,8 @@ +inetnum: 172.20.6.176 - 172.20.6.191 +cidr: 172.20.6.176/28 +netname: COOKIE-NETWORK +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ALLOCATED +source: DN42 diff --git a/data/mntner/COOKIEFACTORY-MNT b/data/mntner/COOKIEFACTORY-MNT index 006fcd6fb..570255b62 100644 --- a/data/mntner/COOKIEFACTORY-MNT +++ b/data/mntner/COOKIEFACTORY-MNT @@ -2,4 +2,5 @@ mntner: COOKIEFACTORY-MNT admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT +auth: pgp-fingerprint E3C597AEA32FA8961F7E2B0B01B15E274A5FDB93 source: DN42 diff --git a/data/route/172.20.6.160_27 b/data/route/172.20.6.160_27 new file mode 100644 index 000000000..a5c3a653e --- /dev/null +++ b/data/route/172.20.6.160_27 @@ -0,0 +1,4 @@ +route: 172.20.6.160/27 +origin: AS4242421860 +mnt-by: COOKIEFACTORY-MNT +source: DN42 diff --git a/data/route/172.20.6.176_28 b/data/route/172.20.6.176_28 new file mode 100644 index 000000000..be4bec385 --- /dev/null +++ b/data/route/172.20.6.176_28 @@ -0,0 +1,4 @@ +route: 172.20.6.176/28 +origin: AS4242421860 +mnt-by: COOKIEFACTORY-MNT +source: DN42 From aadd68478630a4994d6bc8099262ec44df86aad2 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 10 Jun 2019 15:02:01 +0200 Subject: [PATCH 13/16] switch Allocated to Assigned on 172.20.6.176/28 to CookieFactory Signed-off-by: Timo Pollmeier --- data/inetnum/172.20.6.160_27 | 16 ++++++++-------- data/inetnum/172.20.6.176_28 | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/inetnum/172.20.6.160_27 b/data/inetnum/172.20.6.160_27 index 27701cf62..dc16f78d5 100644 --- a/data/inetnum/172.20.6.160_27 +++ b/data/inetnum/172.20.6.160_27 @@ -1,8 +1,8 @@ -inetnum: 172.20.6.160 - 172.20.6.191 -cidr: 172.20.6.160/27 -netname: COOKIE-NETWORK -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -status: ALLOCATED -source: DN42 +inetnum: 172.20.6.160 - 172.20.6.191 +cidr: 172.20.6.160/27 +netname: COOKIE-NETWORK +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ALLOCATED +source: DN42 diff --git a/data/inetnum/172.20.6.176_28 b/data/inetnum/172.20.6.176_28 index 7c07fc04f..cc9b202ca 100644 --- a/data/inetnum/172.20.6.176_28 +++ b/data/inetnum/172.20.6.176_28 @@ -1,8 +1,8 @@ -inetnum: 172.20.6.176 - 172.20.6.191 -cidr: 172.20.6.176/28 -netname: COOKIE-NETWORK -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -status: ALLOCATED -source: DN42 +inetnum: 172.20.6.176 - 172.20.6.191 +cidr: 172.20.6.176/28 +netname: COOKIE-NETWORK +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ASSIGNED +source: DN42 \ No newline at end of file From 9e83e1912510942232a1c4cc5638302a2b736dc2 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 10 Jun 2019 15:19:55 +0200 Subject: [PATCH 14/16] Add pgp-fingerprint to HYP3RX-DN42 person object Signed-off-by: Timo Pollmeier --- data/person/HYP3RX-DN42 | 1 + 1 file changed, 1 insertion(+) diff --git a/data/person/HYP3RX-DN42 b/data/person/HYP3RX-DN42 index 9075e5490..89f068082 100644 --- a/data/person/HYP3RX-DN42 +++ b/data/person/HYP3RX-DN42 @@ -3,3 +3,4 @@ contact: community@cookie-factory.eu nic-hdl: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT source: DN42 +pgp-fingerprint: E3C597AEA32FA8961F7E2B0B01B15E274A5FDB93 From 02a0fc09f74f3b85a3f358bdae786f315fed7289 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 10 Jun 2019 15:40:12 +0200 Subject: [PATCH 15/16] Adding SSH Keys To COOKIEFACTORY-MNT object Signed-off-by: Timo Pollmeier --- data/inetnum/172.20.6.160_27 | 16 ++++++++-------- data/inetnum/172.20.6.176_28 | 16 ++++++++-------- data/mntner/COOKIEFACTORY-MNT | 2 ++ data/person/HYP3RX-DN42 | 2 +- data/route/172.20.6.160_28 | 4 ---- data/route/172.20.6.176_28 | 4 ---- 6 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 data/route/172.20.6.160_28 delete mode 100644 data/route/172.20.6.176_28 diff --git a/data/inetnum/172.20.6.160_27 b/data/inetnum/172.20.6.160_27 index dc16f78d5..27701cf62 100644 --- a/data/inetnum/172.20.6.160_27 +++ b/data/inetnum/172.20.6.160_27 @@ -1,8 +1,8 @@ -inetnum: 172.20.6.160 - 172.20.6.191 -cidr: 172.20.6.160/27 -netname: COOKIE-NETWORK -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -status: ALLOCATED -source: DN42 +inetnum: 172.20.6.160 - 172.20.6.191 +cidr: 172.20.6.160/27 +netname: COOKIE-NETWORK +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ALLOCATED +source: DN42 diff --git a/data/inetnum/172.20.6.176_28 b/data/inetnum/172.20.6.176_28 index cc9b202ca..6e015c12e 100644 --- a/data/inetnum/172.20.6.176_28 +++ b/data/inetnum/172.20.6.176_28 @@ -1,8 +1,8 @@ -inetnum: 172.20.6.176 - 172.20.6.191 -cidr: 172.20.6.176/28 -netname: COOKIE-NETWORK -admin-c: HYP3RX-DN42 -tech-c: HYP3RX-DN42 -mnt-by: COOKIEFACTORY-MNT -status: ASSIGNED -source: DN42 \ No newline at end of file +inetnum: 172.20.6.176 - 172.20.6.191 +cidr: 172.20.6.176/28 +netname: COOKIE-NETWORK +admin-c: HYP3RX-DN42 +tech-c: HYP3RX-DN42 +mnt-by: COOKIEFACTORY-MNT +status: ASSIGNED +source: DN42 diff --git a/data/mntner/COOKIEFACTORY-MNT b/data/mntner/COOKIEFACTORY-MNT index 570255b62..2f089e561 100644 --- a/data/mntner/COOKIEFACTORY-MNT +++ b/data/mntner/COOKIEFACTORY-MNT @@ -3,4 +3,6 @@ admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT auth: pgp-fingerprint E3C597AEA32FA8961F7E2B0B01B15E274A5FDB93 +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDWm+zgeUXH+A5vQp90/ifuC+kMQJkR9t1qOMGgFzEhtBb0VGbgzbTBV1jUpYnMrpet/tRo1X/OVrXCbVMc9kL7XGdOVsF71r99ym9BQlu/a5vERoQoty+f33gR0zyXXCT+2f+mJ+6Eg+7EfesWCbGau3PknSX9Utq6ELmuRJXL/idZye6VOptfMyc2H1IEDS5C5rbo6XxywLwsIf6unk9rUFK6aEnpDlZcalJjiw7BR+duyPCiYVo0aCzkOg4kffZZ/GiW6NOW64IhxxrzZMvMgvW+E98ssuF1mZltQLZNAhade0v7GFBvTy9EITibJu/8+eAEqqB6tShWSTcCB+5WdESt1hcmfZlEQ8IYwkAn4uvWYS7mFdoYEcp978/Nxa1hovL1iHiPebGuTqJklHf1BzU/dBPZRzfvfO3XKAHTq4drgfDcXFXcyjNmKw9jUU+TXj7u7ZMX1uMVmw5vbVnuzgmILOcALwGnwOUx3wp9di52hNRuRjdri/LMgA+JxjFisxUmqywv6iPgcEsVzmok5SI5z9SzkZ5qBND6rybCISlb5PFcXWHk96iIQOpW+jxxHp/B3Av3womkduPzehjsa70P6Da2WJOCqMAnMhckDKnftY0cjw45LnjuQ9OoqqAQUHW1RCyr1xul0+/onRFv7Nkxw6vJT9ttqrpglLnvXQ== +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQZcxaIHWeMqUhxqvpgEs8aduAfAbWODilPele6pBUkQSXbdhTaClkAvi8ooDgeuCw7F2MYdTwWrBkstTn9rDd0f8fdoKObBz98bIKuZGkJWr+JLhxIh8qIPB6BBUgt0j1q4zxZ9Co52d1yELGl4wzeQlhzh8cyoriNNUkYdtDm+yZFSPVMNmm9dzojYM8RVzyNyTOcfFmQL3jWLNpAXjwMrxI6iTz2kWYpd0oPSbglkMn/TKZNQa+XCNooqRlbWAufEWIrdYJGB0zTgq99+YSZJXboY7/i4CP/Pc1zRtSwgL/BpaaxrH8TM5mXM60P/giQIdUTlMTVhT+G67JOwwL timo@s1 source: DN42 diff --git a/data/person/HYP3RX-DN42 b/data/person/HYP3RX-DN42 index 89f068082..15a59d562 100644 --- a/data/person/HYP3RX-DN42 +++ b/data/person/HYP3RX-DN42 @@ -3,4 +3,4 @@ contact: community@cookie-factory.eu nic-hdl: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT source: DN42 -pgp-fingerprint: E3C597AEA32FA8961F7E2B0B01B15E274A5FDB93 +pgp-fingerprint: E3C597AEA32FA8961F7E2B0B01B15E274A5FDB93 diff --git a/data/route/172.20.6.160_28 b/data/route/172.20.6.160_28 deleted file mode 100644 index 125494ae6..000000000 --- a/data/route/172.20.6.160_28 +++ /dev/null @@ -1,4 +0,0 @@ -route: 172.20.6.160/28 -origin: AS4242421860 -mnt-by: COOKIEFACTORY-MNT -source: DN42 diff --git a/data/route/172.20.6.176_28 b/data/route/172.20.6.176_28 deleted file mode 100644 index be4bec385..000000000 --- a/data/route/172.20.6.176_28 +++ /dev/null @@ -1,4 +0,0 @@ -route: 172.20.6.176/28 -origin: AS4242421860 -mnt-by: COOKIEFACTORY-MNT -source: DN42 From 13970088c5e37f53ae72a24e58a1dcc2496fae78 Mon Sep 17 00:00:00 2001 From: Timo Pollmeier Date: Mon, 10 Jun 2019 20:44:31 +0200 Subject: [PATCH 16/16] fix ns1 and ns2 ipadresses of cookie-factory.dn42 --- data/dns/cookie-factory.dn42 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/dns/cookie-factory.dn42 b/data/dns/cookie-factory.dn42 index 661469cc0..dd016fbc0 100644 --- a/data/dns/cookie-factory.dn42 +++ b/data/dns/cookie-factory.dn42 @@ -3,7 +3,7 @@ descr: DNS PROJECT admin-c: HYP3RX-DN42 tech-c: HYP3RX-DN42 mnt-by: COOKIEFACTORY-MNT -nserver: ns1.cookie-factory.dn42 172.22.188.2 -nserver: ns2.cookie-factory.dn42 172.22.188.3 +nserver: ns1.cookie-factory.dn42 172.20.6.165 +nserver: ns2.cookie-factory.dn42 172.20.6.166 remarks: DNS hosted by Cookie-Factory.dn42 source: DN42