diff --git a/bandura.json b/bandura.json index 5655379..6e03e8d 100644 --- a/bandura.json +++ b/bandura.json @@ -1,37 +1,37 @@ { - "person": { - "name": "Marek Küthe", - "email": "crxn@mk16.de", - "gpg": "9AA28159FCEB3CD83BC212017E869146699108C7" - }, - "route": { - "fd92:58b6:2b2::/48": { - "description": "Bandura Communications", - "dns": { - "nserver": "ns1.bandura.crxn", - "ds": "3115 15 2 37C7191FD4573523AAECDAAA127B983191B8F06C9CF0270C6B15CFFD609E8AB7" - }, - "max-len": "48", - "device": { - "fd92:58b6:2b2::": { - "type": "generic", - "description": "anycast ip" - } - } - }, - "fd5c:3e37:2666::/48": { - "description": "Bandura Communications", - "max-len": "56", - "device": { - "fd5c:3e37:2666:c700::1": { - "type": "router", - "description": "grisha.mk16.de" - }, - "fd5c:3e37:2666:4b00::1": { - "type": "router", - "description": "mikhail.mk16.de" - } - } + "person": { + "name": "Marek Küthe", + "email": "crxn@mk16.de", + "gpg": "9AA28159FCEB3CD83BC212017E869146699108C7" + }, + "route": { + "fd92:58b6:2b2::/48": { + "description": "Bandura Communications", + "dns": { + "nserver": "ns1.bandura.crxn", + "ds": "3115 15 2 37C7191FD4573523AAECDAAA127B983191B8F06C9CF0270C6B15CFFD609E8AB7" + }, + "max-len": "48", + "device": { + "fd92:58b6:2b2::": { + "type": "generic", + "description": "anycast ip" } + } + }, + "fd5c:3e37:2666::/48": { + "description": "Bandura Communications", + "max-len": "56", + "device": { + "fd5c:3e37:2666:c700::1": { + "type": "router", + "description": "grisha.mk16.de" + }, + "fd5c:3e37:2666:4b00::1": { + "type": "router", + "description": "mikhail.mk16.de" + } + } } + } } diff --git a/deavmi.json b/deavmi.json index 8f08d1f..f28d1f2 100644 --- a/deavmi.json +++ b/deavmi.json @@ -1,107 +1,101 @@ { - "route": { - "fdae:d3e4:83e4::/48": { - "description": "networknu.home.deavmi.crxn", - "device": { - "fdae:d3e4:83e4::": { - "type": "router" - } - }, - "device": { - "fdae:d3e4:83e4:0:a480:d658:1b7:a23c": { - "type" : "server" - } - } - }, - "fd96:cd8b:f25d::/48": { - "description": "network2.community.deavmi.crxn", - "device": { - "fd96:cd8b:f25d::1": { - "type": "router" - }, - "fd96:cd8b:f25d:0:bc46:8483:b501:8d5": { - "type": "server", - "service": [ - { - "description": "lockdown.bnet IRC server (plaintext)", - "type": "irc", - "endpoint": [ - { "port": 6667 } - ] - }, - { - "description": "lockdown.bnet IRC server (TLS)", - "type": "irc", - "endpoint": [ - { "port": 6697 } - ] - }, - { - "description": "Deavmi's MumbleShack", - "type": "mumble", - "endpoint": [ - { "port": 64738 } - ] - } - ] - } - } - }, - "fdc2:9471:e3ba::/48": { - "description": "alexsrv.deavmi.crxn", - "device": { - "fdc2:9471:e3ba::1": { - "type": "router" - } - } - }, - "fdd2:cbf2:61bd::/48": { - "description": "network1.home.deavmi.crxn", - "device": { - "fdd2:cbf2:61bd::1": { - "type": "router" - }, - "fdd2:cbf2:61bd::2": { - "type": "server", - "service": [ - { - "description": "Personal webserver", - "type": "http", - "endpoint": [ - { "port": 80 } - ] - } - ] - }, - "fdd2:cbf2:61bd::4": { - "type": "server", - "service": [ - { - "description": "Munin frontend", - "type": "http", - "endpoint": [ - { "port": 80 } - ] - } - ] - } - } - }, - "fda2:a9b0:a02b::/48": { - "description": "network2.home.deavmi.crxn", - "device": { - "fda2:a9b0:a02b::1": { - "type": "router" - } - } - }, - "fdf1:1dc1:f54d::/48": { - "description": "deavmi.community.quickconnect.network1", - "device": { - "fdf1:1dc1:f54d::1": { - "type": "router" - } - } - } - } + "route": { + "fdae:d3e4:83e4::/48": { + "description": "networknu.home.deavmi.crxn", + "device": { + "fdae:d3e4:83e4::": { + "type": "router" + }, + + "fdae:d3e4:83e4:0:a480:d658:1b7:a23c": { + "type": "server" + } + } + }, + "fd96:cd8b:f25d::/48": { + "description": "network2.community.deavmi.crxn", + "device": { + "fd96:cd8b:f25d::1": { + "type": "router" + }, + "fd96:cd8b:f25d:0:bc46:8483:b501:8d5": { + "type": "server", + "service": [{ + "description": "lockdown.bnet IRC server (plaintext)", + "type": "irc", + "endpoint": [{ + "port": 6667 + }] + }, + { + "description": "lockdown.bnet IRC server (TLS)", + "type": "irc", + "endpoint": [{ + "port": 6697 + }] + }, + { + "description": "Deavmi's MumbleShack", + "type": "mumble", + "endpoint": [{ + "port": 64738 + }] + } + ] + } + } + }, + "fdc2:9471:e3ba::/48": { + "description": "alexsrv.deavmi.crxn", + "device": { + "fdc2:9471:e3ba::1": { + "type": "router" + } + } + }, + "fdd2:cbf2:61bd::/48": { + "description": "network1.home.deavmi.crxn", + "device": { + "fdd2:cbf2:61bd::1": { + "type": "router" + }, + "fdd2:cbf2:61bd::2": { + "type": "server", + "service": [{ + "description": "Personal webserver", + "type": "http", + "endpoint": [{ + "port": 80 + }] + }] + }, + "fdd2:cbf2:61bd::4": { + "type": "server", + "service": [{ + "description": "Munin frontend", + "type": "http", + "endpoint": [{ + "port": 80 + }] + }] + } + } + }, + "fda2:a9b0:a02b::/48": { + "description": "network2.home.deavmi.crxn", + "device": { + "fda2:a9b0:a02b::1": { + "type": "router" + } + } + }, + "fdf1:1dc1:f54d::/48": { + "description": "deavmi.community.quickconnect.network1", + "device": { + "fdf1:1dc1:f54d::1": { + "type": "router" + } + } + } + } } diff --git a/inactive/minus.json b/inactive/minus.json deleted file mode 100644 index 366abd2..0000000 --- a/inactive/minus.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "route": { - "fdcf:25b5:8c10::/48": { - "description": "minus.home.network", - "device": { - "fdcf:25b5:8c10::1": { - "type": "router" - } - } - } - } -} diff --git a/inactive/phrl.json b/inactive/phrl.json deleted file mode 100644 index 5de3cd6..0000000 --- a/inactive/phrl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "route": { - "fdfb:1a20:a9bf:1000::2ba5/128": { - "description": "phrl42.home.network", - "device": { - "fdfb:1a20:a9bf:1000::2ba5": { - "service": [ - { - "description": "phrl42's website", - "type": "http", - "endpoint": [ - { "port": 80 } - ] - }, - { - "description": "icecast radio", - "type": "http", - "endpoint": [ - { "port": 8000 } - ] - } - ] - } - } - } - } -} diff --git a/inactive/phrl_latest.json b/inactive/phrl_latest.json deleted file mode 100644 index 7e1b43e..0000000 --- a/inactive/phrl_latest.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "route": { - "fdf1:1dc1:f54d:8::1/128": { - "description": "phrl42.home.network", - "device": { - "fdf1:1dc1:f54d:8::1": { - "service": [ - { - "description": "phrl42's website", - "type": "http", - "endpoint": [ - { "port": 80 } - ] - }, - { - "description": "icecast radio", - "type": "http", - "endpoint": [ - { "port": 8000 } - ] - } - ] - } - } - } - } -} diff --git a/inactive/rany.json b/inactive/rany.json deleted file mode 100644 index 2d35246..0000000 --- a/inactive/rany.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "route": { - "fdfb:1a20:a9bf::/48": { - "description": "rany.server.network1", - "device": { - "fdfb:1a20:a9bf::1": { - "type": "router" - } - } - } - } -} diff --git a/inactive/rnb.json b/inactive/rnb.json deleted file mode 100644 index a1f17ec..0000000 --- a/inactive/rnb.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "route": { - "fdf1:1dc1:f54d:5::/64": { - "description": "rnb.home.network", - "device": { - "fdf1:1dc1:f54d:5::": { - "service": [ - { - "description": "BunkerTreff IRC server", - "type": "irc", - "endpoint": [ - { "port": 6667 } - ] - }, - { - "description": "BunkerFiles - File host and Pastebin", - "type": "http", - "endpoint": [ - { "port": 8080 } - ] - }, - { - "description": "Panzerradio - Mostly relaxing Music(Piano, Jazz, etc.)", - "type": "http", - "endpoint": [ - { "port": 8800 } - ] - }, - { - "description": "BunkerTreff IRC Network Informational Page", - "type": "http", - "endpoint": [ - { "port": 8888 } - ] - } - ] - } - } - } - } -} diff --git a/inactive/starland.json b/inactive/starland.json deleted file mode 100644 index fc15e7b..0000000 --- a/inactive/starland.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "route": { - "fd9a:1111:98cc::/48": { - "description": "starland.galactic.network", - "device": { - "fd9a:1111:98cc::1": { - "type": "router" - } - } - }, - "fd7e:33d3:de22::/48": { - "description": "starland.solar.network", - "device": { - "fd7e:33d3:de22::1": { - "type": "router" - } - } - } - } -} diff --git a/inactive/tdemin.json b/inactive/tdemin.json deleted file mode 100644 index e96fbff..0000000 --- a/inactive/tdemin.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "route": { - "fd98:9fde:b4a2::/48": { - "description": "tdemin.home.network", - "device": { - "fd98:9fde:b4a2::1": { - "type": "router" - } - } - } - } -} diff --git a/inactive/thooms.json b/inactive/thooms.json deleted file mode 100644 index f74deb7..0000000 --- a/inactive/thooms.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "route": { - "fdd3:5d24:69d3::/48": { - "description": "thooms@v17", - "device": { - "fdd3:5d24:69d3::1": { - "type": "router" - } - } - } - } -} diff --git a/reddawn.json b/reddawn.json index 0a3f9d0..6cf9652 100644 --- a/reddawn.json +++ b/reddawn.json @@ -1,24 +1,22 @@ { - "route": { - "fd96:21ef:a9ba::/48": { - "description": "reddawn.network", - "device": { - "fd96:21ef:a9ba::1": { - "type": "router", - "service": [ - { - "description": "reddawn.bnet IRC server", - "type": "irc", - "endpoint": [ - { "port": 6667 } - ] - } - ] - }, - "fd96:21ef:a9ba::2": { - "type": "router" - } - } - } - } + "route": { + "fd96:21ef:a9ba::/48": { + "description": "reddawn.network", + "device": { + "fd96:21ef:a9ba::1": { + "type": "router", + "service": [{ + "description": "reddawn.bnet IRC server", + "type": "irc", + "endpoint": [{ + "port": 6667 + }] + }] + }, + "fd96:21ef:a9ba::2": { + "type": "router" + } + } + } + } } diff --git a/schema.json b/schema.json index a400a9f..43b5e64 100644 --- a/schema.json +++ b/schema.json @@ -1,122 +1,121 @@ { - "$schema": "https://json-schema.org/draft-04/schema", - "type": "object", - "description": "You can check a entity with `check-jsonschema --schemafile schema.json entity.json`.", - "properties": { - "person": { - "type": "object", - "properties": { - "name": { - "type": "string", - "pattern": "^.{1,64}$", - "description": "A name must be at least one character long and can be up to 64 characters long." - }, - "email": { - "type": "string", - "format": "email" - }, - "gpg": { - "type": "string", - "pattern": "^[\\dA-F]{40}$", - "description": "GPG fingerprints are stored here without a spaces." - } - }, - "minProperties": 1 + "$schema": "https://json-schema.org/draft-04/schema", + "type": "object", + "description": "You can check a entity with `check-jsonschema --schemafile schema.json entity.json`.", + "properties": { + "person": { + "type": "object", + "properties": { + "name": { + "type": "string", + "pattern": "^.{1,64}$", + "description": "A name must be at least one character long and can be up to 64 characters long." }, - "route": { - "type": "object", - "patternProperties": { - "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))\\/((4[4-9])|(5[1-9])|(6[1-4]))$": { - "type": "object", - "properties": { - "description": { + "email": { + "type": "string", + "format": "email" + }, + "gpg": { + "type": "string", + "pattern": "^[\\dA-F]{40}$", + "description": "GPG fingerprints are stored here without a spaces." + } + }, + "minProperties": 1 + }, + "route": { + "type": "object", + "patternProperties": { + "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))\\/((4[4-9])|(5[1-9])|(6[1-4]))$": { + "type": "object", + "properties": { + "description": { + "type": "string", + "pattern": "^.{1,2048}$" + }, + "dns": { + "type": "object", + "properties": { + "nserver": { + "type": "string", + "format": "hostname" + }, + "ds": { + "type": "string", + "pattern": "\\d{1,10} ([3-9]|1[0-6]) [1-4] [\\dA-F ]{40,384}" + } + }, + "required": [ + "nserver" + ], + "additionalProperties": false + }, + "max-len": { + "type": "string", + "pattern": "((4[4-9])|(5[1-9])|(6[1-4]))" + }, + "device": { + "type": "object", + "patternProperties": { + "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$": { + "type": "object", + "properties": { + "type": { + "type": "string", + "pattern": "^(router|generic|server)$" + }, + "description": { + "type": "string", + "pattern": "^.{1,2048}$" + }, + "service": { + "type": "array", + "items": { + "type": "object", + "properties": { + "type": { + "type": "string", + "pattern": "^.{1,64}$" + }, + "description": { "type": "string", "pattern": "^.{1,2048}$" - }, - "dns": { - "type": "object", - "properties": { - "nserver": { - "type": "string", - "format": "hostname" - }, - "ds": { - "type": "string", - "pattern": "\\d{1,10} ([3-9]|1[0-6]) [1-4] [\\dA-F ]{40,384}" - } + }, + "endpoint": { + "type": "array", + "items": { + "type": "object", + "minProperties": 1 }, - "required": [ - "nserver" - ], - "additionalProperties": false - }, - "max-len": { - "type": "string", - "pattern": "((4[4-9])|(5[1-9])|(6[1-4]))" - }, - "device": { - "type": "object", - "patternProperties": { - "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$": { - "type": "object", - "properties": { - "type": { - "type": "string", - "pattern": "^(router|generic|server)$" - }, - "description": { - "type": "string", - "pattern": "^.{1,2048}$" - }, - "service": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "pattern": "^.{1,64}$" - }, - "description": { - "type": "string", - "pattern": "^.{1,2048}$" - }, - "endpoint": { - "type": "array", - "items": { - "type": "object", - "minProperties": 1 - }, - "minItems": 1, - "uniqueItems": true - }, - "additionalProperties": false - } - }, - "minItems": 1, - "uniqueItems": true - }, - "additionalProperties": false - } - } - }, - "minProperties": 1, - "additionalProperties": false + "minItems": 1, + "uniqueItems": true + }, + "additionalProperties": false } + }, + "minItems": 1, + "uniqueItems": true }, - "required": [ - "device" - ], "additionalProperties": false + } } - }, - "minProperties": 1, - "additionalProperties": false + }, + "minProperties": 1, + "additionalProperties": false + } + }, + "required": [ + "device" + ], + "additionalProperties": false } - }, - "additionalProperties": true, - "required": [ - "route" - ] + }, + "minProperties": 1, + "additionalProperties": false + } + }, + "additionalProperties": true, + "required": [ + "route" + ] } - diff --git a/skiqqy.json b/skiqqy.json index 9ec0930..df05e4f 100644 --- a/skiqqy.json +++ b/skiqqy.json @@ -1,28 +1,27 @@ { - "route": { - "fdd4:975c:1440::/48": { - "description": "skiqqy.xyz", - "device": { - "fdd4:975c:1440::1": { - "type": "router", - "service": [ - { - "description": "Personal webserver", - "type": "http", - "endpoint": [ - { "port": 81 } - ] - }, - { - "description": "Blog", - "type": "http", - "endpoint": [ - { "port": 82 } - ] - } - ] + "route": { + "fdd4:975c:1440::/48": { + "description": "skiqqy.xyz", + "device": { + "fdd4:975c:1440::1": { + "type": "router", + "service": [{ + "description": "Personal webserver", + "type": "http", + "endpoint": [{ + "port": 81 + }] + }, + { + "description": "Blog", + "type": "http", + "endpoint": [{ + "port": 82 + }] + } + ] + } + } } - } } - } -} \ No newline at end of file +} diff --git a/ty3r0x.json b/ty3r0x.json index 36bc5b0..b02031b 100644 --- a/ty3r0x.json +++ b/ty3r0x.json @@ -1,9 +1,9 @@ { "person": { - "name": "Ty3r0X", - "email": "ty3r0x@chaox.ro", - "gpg": "08C1409AF173BEB101E0511A1987C830BBC99F38" - }, + "name": "Ty3r0X", + "email": "ty3r0x@chaox.ro", + "gpg": "08C1409AF173BEB101E0511A1987C830BBC99F38" + }, "route": { "fda7:3ae7:e04d::/64": { "description": "Ty3r0X's Home Network - Romania", @@ -12,10 +12,9 @@ "type": "router", "description": "B0l3yah BIRD router - CRXN & DN42" }, - "fda7:3ae7:e04d::30": { - "type": "client", - "description": "This is the IP I usually use to connect my main box to CRXN" - } + "fda7:3ae7:e04d::30": { + "description": "This is the IP I usually use to connect my main box to CRXN" + } } } }