fix && format

Signed-off-by: Marek Küthe <m.k@mk16.de>
This commit is contained in:
Marek Küthe 2022-12-29 18:14:29 +01:00
parent 75e573595d
commit eebd5a7a4f
No known key found for this signature in database
GPG Key ID: 7E869146699108C7
14 changed files with 293 additions and 467 deletions

View File

@ -1,37 +1,37 @@
{ {
"person": { "person": {
"name": "Marek Küthe", "name": "Marek Küthe",
"email": "crxn@mk16.de", "email": "crxn@mk16.de",
"gpg": "9AA28159FCEB3CD83BC212017E869146699108C7" "gpg": "9AA28159FCEB3CD83BC212017E869146699108C7"
}, },
"route": { "route": {
"fd92:58b6:2b2::/48": { "fd92:58b6:2b2::/48": {
"description": "Bandura Communications", "description": "Bandura Communications",
"dns": { "dns": {
"nserver": "ns1.bandura.crxn", "nserver": "ns1.bandura.crxn",
"ds": "3115 15 2 37C7191FD4573523AAECDAAA127B983191B8F06C9CF0270C6B15CFFD609E8AB7" "ds": "3115 15 2 37C7191FD4573523AAECDAAA127B983191B8F06C9CF0270C6B15CFFD609E8AB7"
}, },
"max-len": "48", "max-len": "48",
"device": { "device": {
"fd92:58b6:2b2::": { "fd92:58b6:2b2::": {
"type": "generic", "type": "generic",
"description": "anycast ip" "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"
}
}
} }
}
},
"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"
}
}
} }
}
} }

View File

@ -1,107 +1,101 @@
{ {
"route": { "route": {
"fdae:d3e4:83e4::/48": { "fdae:d3e4:83e4::/48": {
"description": "networknu.home.deavmi.crxn", "description": "networknu.home.deavmi.crxn",
"device": { "device": {
"fdae:d3e4:83e4::": { "fdae:d3e4:83e4::": {
"type": "router" "type": "router"
} },
},
"device": { "fdae:d3e4:83e4:0:a480:d658:1b7:a23c": {
"fdae:d3e4:83e4:0:a480:d658:1b7:a23c": { "type": "server"
"type" : "server" }
} }
} },
}, "fd96:cd8b:f25d::/48": {
"fd96:cd8b:f25d::/48": { "description": "network2.community.deavmi.crxn",
"description": "network2.community.deavmi.crxn", "device": {
"device": { "fd96:cd8b:f25d::1": {
"fd96:cd8b:f25d::1": { "type": "router"
"type": "router" },
}, "fd96:cd8b:f25d:0:bc46:8483:b501:8d5": {
"fd96:cd8b:f25d:0:bc46:8483:b501:8d5": { "type": "server",
"type": "server", "service": [{
"service": [ "description": "lockdown.bnet IRC server (plaintext)",
{ "type": "irc",
"description": "lockdown.bnet IRC server (plaintext)", "endpoint": [{
"type": "irc", "port": 6667
"endpoint": [ }]
{ "port": 6667 } },
] {
}, "description": "lockdown.bnet IRC server (TLS)",
{ "type": "irc",
"description": "lockdown.bnet IRC server (TLS)", "endpoint": [{
"type": "irc", "port": 6697
"endpoint": [ }]
{ "port": 6697 } },
] {
}, "description": "Deavmi's MumbleShack",
{ "type": "mumble",
"description": "Deavmi's MumbleShack", "endpoint": [{
"type": "mumble", "port": 64738
"endpoint": [ }]
{ "port": 64738 } }
] ]
} }
] }
} },
} "fdc2:9471:e3ba::/48": {
}, "description": "alexsrv.deavmi.crxn",
"fdc2:9471:e3ba::/48": { "device": {
"description": "alexsrv.deavmi.crxn", "fdc2:9471:e3ba::1": {
"device": { "type": "router"
"fdc2:9471:e3ba::1": { }
"type": "router" }
} },
} "fdd2:cbf2:61bd::/48": {
}, "description": "network1.home.deavmi.crxn",
"fdd2:cbf2:61bd::/48": { "device": {
"description": "network1.home.deavmi.crxn", "fdd2:cbf2:61bd::1": {
"device": { "type": "router"
"fdd2:cbf2:61bd::1": { },
"type": "router" "fdd2:cbf2:61bd::2": {
}, "type": "server",
"fdd2:cbf2:61bd::2": { "service": [{
"type": "server", "description": "Personal webserver",
"service": [ "type": "http",
{ "endpoint": [{
"description": "Personal webserver", "port": 80
"type": "http", }]
"endpoint": [ }]
{ "port": 80 } },
] "fdd2:cbf2:61bd::4": {
} "type": "server",
] "service": [{
}, "description": "Munin frontend",
"fdd2:cbf2:61bd::4": { "type": "http",
"type": "server", "endpoint": [{
"service": [ "port": 80
{ }]
"description": "Munin frontend", }]
"type": "http", }
"endpoint": [ }
{ "port": 80 } },
] "fda2:a9b0:a02b::/48": {
} "description": "network2.home.deavmi.crxn",
] "device": {
} "fda2:a9b0:a02b::1": {
} "type": "router"
}, }
"fda2:a9b0:a02b::/48": { }
"description": "network2.home.deavmi.crxn", },
"device": { "fdf1:1dc1:f54d::/48": {
"fda2:a9b0:a02b::1": { "description": "deavmi.community.quickconnect.network1",
"type": "router" "device": {
} "fdf1:1dc1:f54d::1": {
} "type": "router"
}, }
"fdf1:1dc1:f54d::/48": { }
"description": "deavmi.community.quickconnect.network1", }
"device": { }
"fdf1:1dc1:f54d::1": {
"type": "router"
}
}
}
}
} }

View File

@ -1,12 +0,0 @@
{
"route": {
"fdcf:25b5:8c10::/48": {
"description": "minus.home.network",
"device": {
"fdcf:25b5:8c10::1": {
"type": "router"
}
}
}
}
}

View File

@ -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 }
]
}
]
}
}
}
}
}

View File

@ -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 }
]
}
]
}
}
}
}
}

View File

@ -1,12 +0,0 @@
{
"route": {
"fdfb:1a20:a9bf::/48": {
"description": "rany.server.network1",
"device": {
"fdfb:1a20:a9bf::1": {
"type": "router"
}
}
}
}
}

View File

@ -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 }
]
}
]
}
}
}
}
}

View File

@ -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"
}
}
}
}
}

View File

@ -1,12 +0,0 @@
{
"route": {
"fd98:9fde:b4a2::/48": {
"description": "tdemin.home.network",
"device": {
"fd98:9fde:b4a2::1": {
"type": "router"
}
}
}
}
}

View File

@ -1,12 +0,0 @@
{
"route": {
"fdd3:5d24:69d3::/48": {
"description": "thooms@v17",
"device": {
"fdd3:5d24:69d3::1": {
"type": "router"
}
}
}
}
}

View File

@ -1,24 +1,22 @@
{ {
"route": { "route": {
"fd96:21ef:a9ba::/48": { "fd96:21ef:a9ba::/48": {
"description": "reddawn.network", "description": "reddawn.network",
"device": { "device": {
"fd96:21ef:a9ba::1": { "fd96:21ef:a9ba::1": {
"type": "router", "type": "router",
"service": [ "service": [{
{ "description": "reddawn.bnet IRC server",
"description": "reddawn.bnet IRC server", "type": "irc",
"type": "irc", "endpoint": [{
"endpoint": [ "port": 6667
{ "port": 6667 } }]
] }]
} },
] "fd96:21ef:a9ba::2": {
}, "type": "router"
"fd96:21ef:a9ba::2": { }
"type": "router" }
} }
} }
}
}
} }

View File

@ -1,122 +1,121 @@
{ {
"$schema": "https://json-schema.org/draft-04/schema", "$schema": "https://json-schema.org/draft-04/schema",
"type": "object", "type": "object",
"description": "You can check a entity with `check-jsonschema --schemafile schema.json entity.json`.", "description": "You can check a entity with `check-jsonschema --schemafile schema.json entity.json`.",
"properties": { "properties": {
"person": { "person": {
"type": "object", "type": "object",
"properties": { "properties": {
"name": { "name": {
"type": "string", "type": "string",
"pattern": "^.{1,64}$", "pattern": "^.{1,64}$",
"description": "A name must be at least one character long and can be up to 64 characters long." "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
}, },
"route": { "email": {
"type": "object", "type": "string",
"patternProperties": { "format": "email"
"^(([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", "gpg": {
"properties": { "type": "string",
"description": { "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", "type": "string",
"pattern": "^.{1,2048}$" "pattern": "^.{1,2048}$"
}, },
"dns": { "endpoint": {
"type": "object", "type": "array",
"properties": { "items": {
"nserver": { "type": "object",
"type": "string", "minProperties": 1
"format": "hostname"
},
"ds": {
"type": "string",
"pattern": "\\d{1,10} ([3-9]|1[0-6]) [1-4] [\\dA-F ]{40,384}"
}
}, },
"required": [ "minItems": 1,
"nserver" "uniqueItems": true
], },
"additionalProperties": false "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
}, },
"required": [
"device"
],
"additionalProperties": false "additionalProperties": false
}
} }
}, },
"minProperties": 1, "minProperties": 1,
"additionalProperties": false "additionalProperties": false
}
},
"required": [
"device"
],
"additionalProperties": false
} }
}, },
"additionalProperties": true, "minProperties": 1,
"required": [ "additionalProperties": false
"route" }
] },
"additionalProperties": true,
"required": [
"route"
]
} }

View File

@ -1,28 +1,27 @@
{ {
"route": { "route": {
"fdd4:975c:1440::/48": { "fdd4:975c:1440::/48": {
"description": "skiqqy.xyz", "description": "skiqqy.xyz",
"device": { "device": {
"fdd4:975c:1440::1": { "fdd4:975c:1440::1": {
"type": "router", "type": "router",
"service": [ "service": [{
{ "description": "Personal webserver",
"description": "Personal webserver", "type": "http",
"type": "http", "endpoint": [{
"endpoint": [ "port": 81
{ "port": 81 } }]
] },
}, {
{ "description": "Blog",
"description": "Blog", "type": "http",
"type": "http", "endpoint": [{
"endpoint": [ "port": 82
{ "port": 82 } }]
] }
} ]
] }
}
} }
}
} }
} }
}

View File

@ -1,9 +1,9 @@
{ {
"person": { "person": {
"name": "Ty3r0X", "name": "Ty3r0X",
"email": "ty3r0x@chaox.ro", "email": "ty3r0x@chaox.ro",
"gpg": "08C1409AF173BEB101E0511A1987C830BBC99F38" "gpg": "08C1409AF173BEB101E0511A1987C830BBC99F38"
}, },
"route": { "route": {
"fda7:3ae7:e04d::/64": { "fda7:3ae7:e04d::/64": {
"description": "Ty3r0X's Home Network - Romania", "description": "Ty3r0X's Home Network - Romania",
@ -12,10 +12,9 @@
"type": "router", "type": "router",
"description": "B0l3yah BIRD router - CRXN & DN42" "description": "B0l3yah BIRD router - CRXN & DN42"
}, },
"fda7:3ae7:e04d::30": { "fda7:3ae7:e04d::30": {
"type": "client", "description": "This is the IP I usually use to connect my main box to CRXN"
"description": "This is the IP I usually use to connect my main box to CRXN" }
}
} }
} }
} }