From 825a9404d86289c55efd89cb417925cf45ce5a1f Mon Sep 17 00:00:00 2001 From: Felicia Hummel Date: Sat, 9 Jun 2018 23:26:40 +0200 Subject: [PATCH 1/2] Changes: - Changed name from Felicitus to Felicia (legal name change, also affects my nickname, verify the change using my GPG key) - Removed obsolete AS76197 as I'm using iBGP now - Moved subnet 172.22.117.128/25 to AS64616 - Removed myself as maintainer for RaumZeitLabor --- data/aut-num/AS64636 | 1 - data/aut-num/AS64717 | 10 +++++----- data/aut-num/AS76197 | 7 ------- data/dns/rzl | 1 - data/inetnum/172.22.117.0_25 | 10 +++++----- data/inetnum/172.22.117.128_25 | 10 +++++----- data/inetnum/172.22.36.0_23 | 1 - data/mntner/FELICIA-MNT | 5 +++++ data/mntner/FELICITUS-MNT | 6 ------ data/organisation/ORG-RZL | 1 - data/person/FELICIA-DN42 | 6 ++++++ data/person/FELICITUS-DN42 | 5 ----- data/route/172.22.117.0_25 | 4 ++-- data/route/172.22.117.128_25 | 6 +++--- data/route/172.22.36.0_23 | 1 - 15 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 data/aut-num/AS76197 create mode 100644 data/mntner/FELICIA-MNT delete mode 100644 data/mntner/FELICITUS-MNT create mode 100644 data/person/FELICIA-DN42 delete mode 100644 data/person/FELICITUS-DN42 diff --git a/data/aut-num/AS64636 b/data/aut-num/AS64636 index 5443f1ae1..b4fdb7d36 100644 --- a/data/aut-num/AS64636 +++ b/data/aut-num/AS64636 @@ -3,7 +3,6 @@ as-name: RaumZeitLabor descr: RaumZeitLabor hackerspace in Mannheim, Germany org: ORG-RZL mnt-by: LUTOMA-MNT -mnt-by: FELICITUS-MNT mnt-by: DOCSTEEL-MNT mnt-by: HAX404-MNT source: DN42 diff --git a/data/aut-num/AS64717 b/data/aut-num/AS64717 index b3b518e2c..0a564662b 100644 --- a/data/aut-num/AS64717 +++ b/data/aut-num/AS64717 @@ -1,7 +1,7 @@ aut-num: AS64717 -as-name: FELICITUS-AS -descr: Felicitus -admin-c: FELICITUS-DN42 -tech-c: FELICITUS-DN42 -mnt-by: FELICITUS-MNT +as-name: FELICIA-AS +descr: Felicia +admin-c: FELICIA-DN42 +tech-c: FELICIA-DN42 +mnt-by: FELICIA-MNT source: DN42 diff --git a/data/aut-num/AS76197 b/data/aut-num/AS76197 deleted file mode 100644 index 1eb976cc2..000000000 --- a/data/aut-num/AS76197 +++ /dev/null @@ -1,7 +0,0 @@ -aut-num: AS76197 -as-name: FELICITUS-HOME-AS -descr: Felicitus Home Network -admin-c: FELICITUS-DN42 -tech-c: FELICITUS-DN42 -mnt-by: FELICITUS-MNT -source: DN42 diff --git a/data/dns/rzl b/data/dns/rzl index 51a66fdf7..5ec1b176a 100644 --- a/data/dns/rzl +++ b/data/dns/rzl @@ -3,7 +3,6 @@ org: ORG-RZL status: CONNECT nserver: ns1.rzl.g.nic.dn42 172.22.36.250 mnt-by: LUTOMA-MNT -mnt-by: FELICITUS-MNT mnt-by: DOCSTEEL-MNT mnt-by: HAX404-MNT source: DN42 diff --git a/data/inetnum/172.22.117.0_25 b/data/inetnum/172.22.117.0_25 index b070853f5..eafc330ae 100644 --- a/data/inetnum/172.22.117.0_25 +++ b/data/inetnum/172.22.117.0_25 @@ -1,10 +1,10 @@ inetnum: 172.22.117.0 - 172.22.117.127 -netname: NET-FELICITUS -descr: Felicitus Server Network +netname: NET-FELICIA +descr: Felicia Server Network country: DE -admin-c: FELICITUS-DN42 -tech-c: FELICITUS-DN42 +admin-c: FELICIA-DN42 +tech-c: FELICIA-DN42 status: ASSIGNED -mnt-by: FELICITUS-MNT +mnt-by: FELICIA-MNT cidr: 172.22.117.0/25 source: DN42 diff --git a/data/inetnum/172.22.117.128_25 b/data/inetnum/172.22.117.128_25 index 50d87326c..b6542aa58 100644 --- a/data/inetnum/172.22.117.128_25 +++ b/data/inetnum/172.22.117.128_25 @@ -1,10 +1,10 @@ inetnum: 172.22.117.128 - 172.22.117.255 -netname: NET-FELICITUS-HOME -descr: Felicitus Home Network +netname: NET-FELICIA-HOME +descr: Felicia Home Network country: DE -admin-c: FELICITUS-DN42 -tech-c: FELICITUS-DN42 -mnt-by: FELICITUS-MNT +admin-c: FELICIA-DN42 +tech-c: FELICIA-DN42 +mnt-by: FELICIA-MNT status: ASSIGNED cidr: 172.22.117.128/25 source: DN42 diff --git a/data/inetnum/172.22.36.0_23 b/data/inetnum/172.22.36.0_23 index f77849702..c2a45ba2b 100644 --- a/data/inetnum/172.22.36.0_23 +++ b/data/inetnum/172.22.36.0_23 @@ -7,7 +7,6 @@ status: ALLOCATED nserver: dns.rzl cidr: 172.22.36.0/23 mnt-by: LUTOMA-MNT -mnt-by: FELICITUS-MNT mnt-by: DOCSTEEL-MNT mnt-by: HAX404-MNT source: DN42 diff --git a/data/mntner/FELICIA-MNT b/data/mntner/FELICIA-MNT new file mode 100644 index 000000000..e21564dfd --- /dev/null +++ b/data/mntner/FELICIA-MNT @@ -0,0 +1,5 @@ +mntner: FELICIA-MNT +admin-c: FELICIA-DN42 +tech-c: FELICIA-DN42 +mnt-by: FELICIA-MNT +source: DN42 diff --git a/data/mntner/FELICITUS-MNT b/data/mntner/FELICITUS-MNT deleted file mode 100644 index eda72807a..000000000 --- a/data/mntner/FELICITUS-MNT +++ /dev/null @@ -1,6 +0,0 @@ -mntner: FELICITUS-MNT -sha512-pw: NmIzMWQ4YzBkYWQzNDg1NTg4NDhlMTVmMzk4ZGRhMzJkMzQ4MTY4MDA3YzY2Njk0ODFjYjQ1YTFiZTIzY2ZmN2JiMTFlMDhmOTUxYTIzNjMzMDk2MmUwODU3ZDJjOTllOTk4MzE2MDJlZjVlYjYwMzVkMjAyODg4ZTdiYzlhZjc4MmMyYjBkZjdmMWI4ZmVhZTM2YWNjZWRmMzI5NGUxMGMyN2VhZTk4YzljMDQyZjljNzZhZjEyNTRkYTYxZTU5NzNjNjNiOWI4NGI2NDZiMjI2MGQzODRjZDBiZWMzZmIwNDIyMGZhZmI2OTg2M2E0ZTg1MTdmOWJkNjliZjRhNGI3NmI4Mzk3MTk1MDdmYWM5Nzg1ODVkZTVmNDU4ZWFlMjdlYjYxNzY2MTUyYWM1YTcwNzUwOWI2YWVlOWRjMWNmZTdjMzg3NzkyNjUwNjlhNTQ1N2UzN2ZkYTZmYjFmZWVhMTRlMDhlYjgzNmUyMGVmZmQyNzJlOTBiYjcxMDYwYjAwN2ViMTBlYTZhYjEyMmRlMzQ1NGFlMmNlYWE4NmI5NjA0ZTk1YzEzZTk0MmY0YTBhY2IzNDIxZDJlZTU3NTJiMmJlMDZlMTNhMTM4NjYzZDMwYjhiOWM5NjE4ZTMxODk1NDJkZWFmODJkODJjY2JjMGQxNjljOTNiZDk5NzQ= -admin-c: FELICITUS-DN42 -tech-c: FELICITUS-DN42 -mnt-by: FELICITUS-MNT -source: DN42 diff --git a/data/organisation/ORG-RZL b/data/organisation/ORG-RZL index f605dc5da..8a539cfe0 100644 --- a/data/organisation/ORG-RZL +++ b/data/organisation/ORG-RZL @@ -10,7 +10,6 @@ address: 68309 Mannheim address: Germany geoloc: 49.508104 8.499421 mnt-by: LUTOMA-MNT -mnt-by: FELICITUS-MNT mnt-by: DOCSTEEL-MNT mnt-by: HAX404-MNT source: DN42 diff --git a/data/person/FELICIA-DN42 b/data/person/FELICIA-DN42 new file mode 100644 index 000000000..86ed4425a --- /dev/null +++ b/data/person/FELICIA-DN42 @@ -0,0 +1,6 @@ +person: FELICIA +contact: mailto:felicia@drachenkatze.org +nick: Drachenkatze +nic-hdl: FELICIA-DN42 +mnt-by: FELICIA-MNT +source: DN42 diff --git a/data/person/FELICITUS-DN42 b/data/person/FELICITUS-DN42 deleted file mode 100644 index be0d918f8..000000000 --- a/data/person/FELICITUS-DN42 +++ /dev/null @@ -1,5 +0,0 @@ -person: FELICITUS -contact: mailto:felicitus+dn42@felicitus.org -nic-hdl: FELICITUS-DN42 -mnt-by: FELICITUS-MNT -source: DN42 diff --git a/data/route/172.22.117.0_25 b/data/route/172.22.117.0_25 index 26bdcae62..9cdba0d4f 100644 --- a/data/route/172.22.117.0_25 +++ b/data/route/172.22.117.0_25 @@ -1,5 +1,5 @@ route: 172.22.117.0/25 -descr: Felicitus Server Net +descr: Felicia Server Net origin: AS64717 -mnt-by: FELICITUS-MNT +mnt-by: FELICIA-MNT source: DN42 diff --git a/data/route/172.22.117.128_25 b/data/route/172.22.117.128_25 index 060444886..2aaa5f6fd 100644 --- a/data/route/172.22.117.128_25 +++ b/data/route/172.22.117.128_25 @@ -1,5 +1,5 @@ route: 172.22.117.128/25 -descr: Felicitus Home Net -origin: AS76197 -mnt-by: FELICITUS-MNT +descr: Felicia Home Net +origin: AS64717 +mnt-by: FELICIA-MNT source: DN42 diff --git a/data/route/172.22.36.0_23 b/data/route/172.22.36.0_23 index 6486966ce..d229f3a30 100644 --- a/data/route/172.22.36.0_23 +++ b/data/route/172.22.36.0_23 @@ -2,7 +2,6 @@ route: 172.22.36.0/23 descr: RaumZeitLabor dn42 network origin: AS64636 mnt-by: LUTOMA-MNT -mnt-by: FELICITUS-MNT mnt-by: DOCSTEEL-MNT mnt-by: HAX404-MNT source: DN42 From 08f466f3ce317e89d6b5034cff88dfb84c594dcf Mon Sep 17 00:00:00 2001 From: Felicia Hummel Date: Sat, 9 Jun 2018 23:32:13 +0200 Subject: [PATCH 2/2] Changes: - Added pgp fingerprint - Added secondary nickname I use in IRC --- data/mntner/FELICIA-MNT | 1 + data/person/FELICIA-DN42 | 1 + 2 files changed, 2 insertions(+) diff --git a/data/mntner/FELICIA-MNT b/data/mntner/FELICIA-MNT index e21564dfd..dce827650 100644 --- a/data/mntner/FELICIA-MNT +++ b/data/mntner/FELICIA-MNT @@ -2,4 +2,5 @@ mntner: FELICIA-MNT admin-c: FELICIA-DN42 tech-c: FELICIA-DN42 mnt-by: FELICIA-MNT +auth: pgp-fingerprint CEA3FF08977870E1DF69DB0057E1C4CBCED4FD8D source: DN42 diff --git a/data/person/FELICIA-DN42 b/data/person/FELICIA-DN42 index 86ed4425a..3300ba2cb 100644 --- a/data/person/FELICIA-DN42 +++ b/data/person/FELICIA-DN42 @@ -1,6 +1,7 @@ person: FELICIA contact: mailto:felicia@drachenkatze.org nick: Drachenkatze +nick: Felicia nic-hdl: FELICIA-DN42 mnt-by: FELICIA-MNT source: DN42