updates, ssh hosts change, fix misskey federation

This commit is contained in:
Chaos 2022-12-20 12:28:00 +00:00
parent c7c06523d8
commit 847b009d6c
No known key found for this signature in database
6 changed files with 611 additions and 602 deletions

View file

@ -138,11 +138,11 @@
"utils": "utils_4" "utils": "utils_4"
}, },
"locked": { "locked": {
"lastModified": 1670970889, "lastModified": 1671459164,
"narHash": "sha256-TWJo3/X3Q3r+HeX16QN4FE6ddBpGtAboymSEF+4Nnc0=", "narHash": "sha256-RbkDnvLV7WjbiF4Dpiezrf8kXxwieQXAVtY8ciRQj6Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e412025fffdcd6219ddd21c65d9a1b90005ce508", "rev": "e7eba9cc46547ae86642ad3c6a9a4fb22c07bc26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,11 +191,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1670929434, "lastModified": 1671359686,
"narHash": "sha256-n5UBO6XBV4h3TB7FYu2yAuNQMEYOrQyKeODUwKe06ow=", "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1710ed1f6f8ceb75cf7d1cf55ee0cc21760e1c7a", "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +207,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1671019582, "lastModified": 1671533103,
"narHash": "sha256-Ki8iKDIc7c+vMhIU34dH+gCBqFnE2EbPWibGj0O1MS4=", "narHash": "sha256-AtYVnkWVYMyTTXNOI+6x66EMpm+SvnYscd5QQBIZ3ak=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "27d5000771adf5be0b91d9c3b9c04518e30f0fa6", "rev": "d67c890fc1096b9c8706c1c46f8e3fec06add355",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,10 +2,23 @@
programs.ssh.enable = true; programs.ssh.enable = true;
programs.ssh.matchBlocks = programs.ssh.matchBlocks =
lib.mkMerge lib.mkMerge
(lib.forEach ["hetzner-vm" "storage" "vault" "vault-decrypt" "buildbox"] (hostname: { ((lib.forEach ["hetzner-vm" "vault" "vault-decrypt" "buildbox"] (hostname: {
"${hostname}" = { "${hostname}" = {
user = "root"; user = "root";
hostname = "${hostname}.servers.genderfucked.monster"; hostname = "${hostname}.servers.genderfucked.monster";
}; };
})); }))
++ [
{
"storage" = {
user = "root";
hostname = "192.168.100.11";
proxyJump = "hetzner-vm";
};
"blahaj" = {
user = "chaos";
hostname = "blahaj.sapphicco.de";
};
}
]);
} }

View file

@ -40,6 +40,8 @@
port = ports.misskey-redis; port = ports.misskey-redis;
}; };
# Allows federation with gotosocial which requires AP Get to be signed
signToActivityPubGet = true;
clusterLimit = 4; clusterLimit = 4;
outgoingAddressFamily = "dual"; outgoingAddressFamily = "dual";
}; };

View file

@ -1,10 +1,4 @@
{ { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec {
fetchurl,
fetchgit,
linkFarm,
runCommand,
gnutar,
}: rec {
offline_cache = linkFarm "offline" packages; offline_cache = linkFarm "offline" packages;
packages = [ packages = [
{ {
@ -944,11 +938,11 @@
}; };
} }
{ {
name = "_iconify_json___json_2.1.152.tgz"; name = "_iconify_json___json_2.1.154.tgz";
path = fetchurl { path = fetchurl {
name = "_iconify_json___json_2.1.152.tgz"; name = "_iconify_json___json_2.1.154.tgz";
url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.1.152.tgz"; url = "https://registry.yarnpkg.com/@iconify/json/-/json-2.1.154.tgz";
sha512 = "0aKAcK5Ciq4S7Fu4wXBYaRQgYeW4NL6bhcoUa2E1nm2b7uQ3d4FSMxHp6RReBXgUjWA7JgpyqgPEYIf36wkGGA=="; sha512 = "RpUu4zDoeqIAzD54t8mfCKca+fzASgFf+lFE7Y9OzvScrf+IbUrvyZZEcOkjEB1cB4emDgmWGTAAkVTihhaqxQ==";
}; };
} }
{ {
@ -3872,11 +3866,11 @@
}; };
} }
{ {
name = "shaka_player___shaka_player_4.3.1.tgz"; name = "shaka_player___shaka_player_4.3.2.tgz";
path = fetchurl { path = fetchurl {
name = "shaka_player___shaka_player_4.3.1.tgz"; name = "shaka_player___shaka_player_4.3.2.tgz";
url = "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.3.1.tgz"; url = "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.3.2.tgz";
sha512 = "TeZh80k1o2zba/bC8H+ypmosTA9dgfNK5UZM8taK2j1vQgICrqiOEK0HuzFoZ3hOTLvGo6IhIIUSXfaGelO66g=="; sha512 = "sHGDKhKJTPeTks5BiASqr+E+daPHrLYSznEasHR2b7VR34D1OcAcVJk3WQXQiV03tWFFydFGHrgxQDmj1hIA+Q==";
}; };
} }
{ {

View file

@ -1,11 +1,11 @@
{ {
"frontend": { "frontend": {
"rev": "3d94e0f3c7b5ac9372187abda9efda3c370b5949", "rev": "394362c8fd1eafcdf93c1123937455fd70bda8a8",
"sha256": "sha256-fgb79jVHjXuZEVRZbpHCsJzQQ7NZEuEB0xi3iLtHoVA=" "sha256": "sha256-pvj6qvhAKuOrhNd/+P/lOa5RL+j+gBeebQXX1pymrb8="
}, },
"backend": { "backend": {
"rev": "c61aeb9eeba7fed7d7d692e38e7a19ee3b929878", "rev": "3b4f5274e66fe7ba35ef8ddc979d4ff19b9a102b",
"sha256": "sha256-FlLa6EheWyMAFuu+sWkdY2mh6B4x1+vMSvLUxzKl/RA=" "sha256": "sha256-5rOEm9C1mTXAm6ZPSD7fU4lxH2zA0OaIlCmO3o/0dng="
}, },
"proxy": { "proxy": {
"rev": "b77dd3f259d5b8cd647d5906c737632928b1c69b", "rev": "b77dd3f259d5b8cd647d5906c737632928b1c69b",