diff --git a/etc.hosts b/etc.hosts index 13cf063..37d2342 100644 --- a/etc.hosts +++ b/etc.hosts @@ -280,6 +280,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.0.66 4.green.r 42:0:ce16::12ee green.r 42:0:ce16::12ee 6.green.r +10.243.217.217 grill.r +10.243.217.217 4.grill.r +42:0:6a0a:c4b1:2d6c:1f3f:a3c6:9d96 grill.r +42:0:6a0a:c4b1:2d6c:1f3f:a3c6:9d96 6.grill.r 10.243.0.213 gum.r blog.gum.r blog.makefu.r cache.gum.r cgit.gum.r dcpp.gum.r dcpp.nextgum.r graph.makefu.r logs.makefu.r netdata.makefu.r nextgum.r o.gum.r search.makefu.r stats.makefu.r torrent.gum.r tracker.makefu.r wiki.gum.r wiki.makefu.r warrior.gum.r rss.makefu.r sick.makefu.r dl.gum.r dl.makefu.r 10.243.0.213 4.gum.r 4.blog.gum.r 4.blog.makefu.r 4.cache.gum.r 4.cgit.gum.r 4.dcpp.gum.r 4.dcpp.nextgum.r 4.graph.makefu.r 4.logs.makefu.r 4.netdata.makefu.r 4.nextgum.r 4.o.gum.r 4.search.makefu.r 4.stats.makefu.r 4.torrent.gum.r 4.tracker.makefu.r 4.wiki.gum.r 4.wiki.makefu.r 4.warrior.gum.r 4.rss.makefu.r 4.sick.makefu.r 4.dl.gum.r 4.dl.makefu.r 42:0:e644:238d:3e46:c884:6ec5:16c gum.r blog.gum.r blog.makefu.r cache.gum.r cgit.gum.r dcpp.gum.r dcpp.nextgum.r graph.makefu.r logs.makefu.r netdata.makefu.r nextgum.r o.gum.r search.makefu.r stats.makefu.r torrent.gum.r tracker.makefu.r wiki.gum.r wiki.makefu.r warrior.gum.r rss.makefu.r sick.makefu.r dl.gum.r dl.makefu.r @@ -464,8 +468,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:488f:d2ae:e265:bd57:dcbe 6.papawhakaaro.r 6.tp.feliks.r 10.243.143.11 petrosilia.r 10.243.143.11 4.petrosilia.r -42:0:3c46:2dfc:6991:79ff:a57a:9984 petrosilia.r -42:0:3c46:2dfc:6991:79ff:a57a:9984 6.petrosilia.r 10.243.4.43 ponte.r 10.243.4.43 4.ponte.r 42::443 ponte.r @@ -474,10 +476,10 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 10.243.100.101 4.porree.r 42:0:3c46:b51c:b34d:b7e1:3b02:8d24 porree.r 42:0:3c46:b51c:b34d:b7e1:3b02:8d24 6.porree.r -10.243.0.103 prism.r cache.prism.r cgit.prism.r bota.r flix.r paste.r c.r p.r search.r -10.243.0.103 4.prism.r 4.cache.prism.r 4.cgit.prism.r 4.bota.r 4.flix.r 4.paste.r 4.c.r 4.p.r 4.search.r -42:0:ce16::1 prism.r cache.prism.r cgit.prism.r bota.r flix.r paste.r c.r p.r search.r -42:0:ce16::1 6.prism.r 6.cache.prism.r 6.cgit.prism.r 6.bota.r 6.flix.r 6.paste.r 6.c.r 6.p.r 6.search.r +10.243.0.103 prism.r cache.prism.r cgit.prism.r bota.r flix.r paste.r c.r p.r search.r wallpaper.r +10.243.0.103 4.prism.r 4.cache.prism.r 4.cgit.prism.r 4.bota.r 4.flix.r 4.paste.r 4.c.r 4.p.r 4.search.r 4.wallpaper.r +42:0:ce16::1 prism.r cache.prism.r cgit.prism.r bota.r flix.r paste.r c.r p.r search.r wallpaper.r +42:0:ce16::1 6.prism.r 6.cache.prism.r 6.cgit.prism.r 6.bota.r 6.flix.r 6.paste.r 6.c.r 6.p.r 6.search.r 6.wallpaper.r 10.243.77.2 puyak.r build.puyak.r cgit.puyak.r 10.243.77.2 4.puyak.r 4.build.puyak.r 4.cgit.puyak.r 42:0:ca48:f98f:63d7:31ce:922b:245d puyak.r build.puyak.r cgit.puyak.r @@ -586,8 +588,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:4a6f::4266 6.thecostraca.crustacea.r 10.243.117.12 toastbrot.r 10.243.117.12 4.toastbrot.r -42:0:3c46:d517:31c3:3ef8:31e7:c0b8 toastbrot.r -42:0:3c46:d517:31c3:3ef8:31e7:c0b8 6.toastbrot.r 10.243.183.236 tpsw.r 10.243.183.236 4.tpsw.r 42:0:3c46:7eec:653c:73c1:91dc:f89e tpsw.r diff --git a/etc.hosts-v6only b/etc.hosts-v6only index 2a03ee5..db14445 100644 --- a/etc.hosts-v6only +++ b/etc.hosts-v6only @@ -214,6 +214,8 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:3c46:ab64:fa7c:171a:c94a:ac19 6.graham.r 42:0:ce16::12ee green.r 42:0:ce16::12ee 6.green.r +42:0:6a0a:c4b1:2d6c:1f3f:a3c6:9d96 grill.r +42:0:6a0a:c4b1:2d6c:1f3f:a3c6:9d96 6.grill.r 42:0:e644:238d:3e46:c884:6ec5:16c gum.r blog.gum.r blog.makefu.r cache.gum.r cgit.gum.r dcpp.gum.r dcpp.nextgum.r graph.makefu.r logs.makefu.r netdata.makefu.r nextgum.r o.gum.r search.makefu.r stats.makefu.r torrent.gum.r tracker.makefu.r wiki.gum.r wiki.makefu.r warrior.gum.r rss.makefu.r sick.makefu.r dl.gum.r dl.makefu.r 42:0:e644:238d:3e46:c884:6ec5:16c 6.gum.r 6.blog.gum.r 6.blog.makefu.r 6.cache.gum.r 6.cgit.gum.r 6.dcpp.gum.r 6.dcpp.nextgum.r 6.graph.makefu.r 6.logs.makefu.r 6.netdata.makefu.r 6.nextgum.r 6.o.gum.r 6.search.makefu.r 6.stats.makefu.r 6.torrent.gum.r 6.tracker.makefu.r 6.wiki.gum.r 6.wiki.makefu.r 6.warrior.gum.r 6.rss.makefu.r 6.sick.makefu.r 6.dl.gum.r 6.dl.makefu.r 42:0:e644:9099:4f8:b9aa:3856:4e86 hasegateway.r @@ -312,14 +314,12 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:ce16::12a 6.orange.r 6.cgit.orange.r 42:0:3c46:488f:d2ae:e265:bd57:dcbe papawhakaaro.r tp.feliks.r 42:0:3c46:488f:d2ae:e265:bd57:dcbe 6.papawhakaaro.r 6.tp.feliks.r -42:0:3c46:2dfc:6991:79ff:a57a:9984 petrosilia.r -42:0:3c46:2dfc:6991:79ff:a57a:9984 6.petrosilia.r 42::443 ponte.r 42::443 6.ponte.r 42:0:3c46:b51c:b34d:b7e1:3b02:8d24 porree.r 42:0:3c46:b51c:b34d:b7e1:3b02:8d24 6.porree.r -42:0:ce16::1 prism.r cache.prism.r cgit.prism.r bota.r flix.r paste.r c.r p.r search.r -42:0:ce16::1 6.prism.r 6.cache.prism.r 6.cgit.prism.r 6.bota.r 6.flix.r 6.paste.r 6.c.r 6.p.r 6.search.r +42:0:ce16::1 prism.r cache.prism.r cgit.prism.r bota.r flix.r paste.r c.r p.r search.r wallpaper.r +42:0:ce16::1 6.prism.r 6.cache.prism.r 6.cgit.prism.r 6.bota.r 6.flix.r 6.paste.r 6.c.r 6.p.r 6.search.r 6.wallpaper.r 42:0:ca48:f98f:63d7:31ce:922b:245d puyak.r build.puyak.r cgit.puyak.r 42:0:ca48:f98f:63d7:31ce:922b:245d 6.puyak.r 6.build.puyak.r 6.cgit.puyak.r 42:0:3c46:123e:bbea:3529:db39:6764 qubasa.r @@ -380,8 +380,6 @@ fe80::9400:1ff:fe24:33f4 6.gum.i 42:0:4a6f::4265 6.tantulocarida.crustacea.r 42:0:4a6f::4266 thecostraca.crustacea.r 42:0:4a6f::4266 6.thecostraca.crustacea.r -42:0:3c46:d517:31c3:3ef8:31e7:c0b8 toastbrot.r -42:0:3c46:d517:31c3:3ef8:31e7:c0b8 6.toastbrot.r 42:0:3c46:7eec:653c:73c1:91dc:f89e tpsw.r 42:0:3c46:7eec:653c:73c1:91dc:f89e 6.tpsw.r 42:0:e644:2215:73ba:f838:855e:945b tsp.r diff --git a/hosts/grill b/hosts/grill new file mode 100644 index 0000000..9d9c967 --- /dev/null +++ b/hosts/grill @@ -0,0 +1,20 @@ +Subnet = 10.243.217.217 +Subnet = 42:0:6a0a:c4b1:2d6c:1f3f:a3c6:9d96 + +-----BEGIN RSA PUBLIC KEY----- +MIICCgKCAgEAs4P6CfRcwFGCqkfv1tyTbbk2eHh08kEqxPNQ655sMKWxMhgRnRII +1ooJW+q3zOm0P4IySvQkqPCXiynPBKG+W8vz6as4/TjMgqz45zTSZaoGsUjPS7Yg +L9qN6bLNJUhjPtyBBIX5l+WSii2RkbtcFTewY9HITPgOvu5rSiYgdz1X86BDTy0w +E6g13jwjI0D29jFAXIIfSwfvqikHmicr++3R4URPTiY7Vcg3UtIYGaKEFTPid0Da +bd47ZNWI99CI5Znzd4aJSD+0lfD6+EZb4nQ2o/VZ5RRUid9qWKHu5pbXvPrwE5uC +TWtsP1nla+zx1nDD2UHt0bJzdfz4sEFrmLHBqsdvfgAlVvVr65ZMIOO5X0fevHi4 +s3jqYPMLksimuQjHCXYcgxfBYkVPuVWqDivOV8Z60UhAop5xK9i+FV4kyTgL+qmH +79VAy8+2Wrzda/MBVFF+0XAryBtqFgk5JtmfRKJ5rcXFy9hnugmfulOC0+XFPFbN +cNLbPR/dwON6YIg90z0wwJfPoWwzj3jKwT7YZ/pYSEl0JDgkpTzCxiBbqpJ/r8CZ +2avRws5YMVnLcuY1IFlNLJdUZdz+41zmPizIP0dAdrwDH56AJkTukESf1Ir6G2NT +isn3pijKy4Y/EbWnJiQpEKDfNh8JW1Ryw1zvNYKYR3OAImp3DgsWmeECAwEAAQ== +-----END RSA PUBLIC KEY----- + +Ed25519PublicKey = cqfMY/8kqtuM5wIzYMNfFIc47Jx1nnfV0//SMpsO61G + +Weight = 300 \ No newline at end of file diff --git a/hosts/petrosilia b/hosts/petrosilia index fd6502e..f053e8f 100644 --- a/hosts/petrosilia +++ b/hosts/petrosilia @@ -1,5 +1,4 @@ Subnet = 10.243.143.11 -Subnet = 42:0:3c46:2dfc:6991:79ff:a57a:9984 -----BEGIN RSA PUBLIC KEY----- MIICCgKCAgEAxDumQ/06Yd3AQPSlHH9/kNngbc/tq5yBuT0ymbQGMHLL9X3pCz/f diff --git a/hosts/toastbrot b/hosts/toastbrot index 298a29f..81b1216 100644 --- a/hosts/toastbrot +++ b/hosts/toastbrot @@ -1,5 +1,4 @@ Subnet = 10.243.117.12 -Subnet = 42:0:3c46:d517:31c3:3ef8:31e7:c0b8 -----BEGIN PUBLIC KEY----- MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA12VLPJMhGSh5fQgrB6bP