fix: update to the noisebell modules
This commit is contained in:
parent
5dc8fce5ae
commit
5204cc3af6
4 changed files with 19 additions and 212 deletions
|
|
@ -14,5 +14,4 @@ in {
|
|||
"secrets/noisebell-inbound-api-key.age".publicKeys = [ server jet ];
|
||||
"secrets/noisebell-discord-token.age".publicKeys = [ server jet ];
|
||||
"secrets/noisebell-discord-webhook-secret.age".publicKeys = [ server jet ];
|
||||
"secrets/noisebell-rss-webhook-secret.age".publicKeys = [ server jet ];
|
||||
}
|
||||
|
|
|
|||
214
flake.lock
generated
214
flake.lock
generated
|
|
@ -38,36 +38,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane_2": {
|
||||
"locked": {
|
||||
"lastModified": 1773115265,
|
||||
"narHash": "sha256-5fDkKTYEgue2klksd52WvcXfZdY1EIlbk0QggAwpFog=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "27711550d109bf6236478dc9f53b9e29c1a374c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane_3": {
|
||||
"locked": {
|
||||
"lastModified": 1773115265,
|
||||
"narHash": "sha256-5fDkKTYEgue2klksd52WvcXfZdY1EIlbk0QggAwpFog=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "27711550d109bf6236478dc9f53b9e29c1a374c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -97,11 +67,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773025010,
|
||||
"narHash": "sha256-khlHllTsovXgT2GZ0WxT4+RvuMjNeR5OW0UYeEHPYQo=",
|
||||
"lastModified": 1773506317,
|
||||
"narHash": "sha256-qWKbLUJpavIpvOdX1fhHYm0WGerytFHRoh9lVck6Bh0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "7b9f7f88ab3b339f8142dc246445abb3c370d3d3",
|
||||
"rev": "878ec37d6a8f52c6c801d0e2a2ad554c75b9353c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -172,11 +142,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1772963539,
|
||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
||||
"lastModified": 1773646010,
|
||||
"narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
||||
"rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -187,54 +157,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1772963539,
|
||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1772963539,
|
||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1772963539,
|
||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1744536153,
|
||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||
|
|
@ -252,20 +174,19 @@
|
|||
},
|
||||
"noisebell": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"noisebell-cache": "noisebell-cache",
|
||||
"noisebell-discord": "noisebell-discord",
|
||||
"noisebell-rss": "noisebell-rss"
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"dir": "remote",
|
||||
"lastModified": 1773188969,
|
||||
"narHash": "sha256-jJUjd8f8yw68DdN5UF4n51lYm0kpihkaDZZKuj9VmP4=",
|
||||
"lastModified": 1773729127,
|
||||
"narHash": "sha256-KwxwZGlTHOZCCY+pDhwmluZctCSD7tFes87LWQ8h1Sg=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "a74e5753fafcfe0a9f20ac2e2c625e458c4dc329",
|
||||
"revCount": 29,
|
||||
"rev": "dc7b8cbaddc6a44aa05b2d3f7c42dc98dd24f060",
|
||||
"revCount": 30,
|
||||
"type": "git",
|
||||
"url": "https://git.extremist.software/jet/noisebell"
|
||||
},
|
||||
|
|
@ -275,60 +196,6 @@
|
|||
"url": "https://git.extremist.software/jet/noisebell"
|
||||
}
|
||||
},
|
||||
"noisebell-cache": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"path": "./cache-service",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "./cache-service",
|
||||
"type": "path"
|
||||
},
|
||||
"parent": [
|
||||
"noisebell"
|
||||
]
|
||||
},
|
||||
"noisebell-discord": {
|
||||
"inputs": {
|
||||
"crane": "crane_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"rust-overlay": "rust-overlay_3"
|
||||
},
|
||||
"locked": {
|
||||
"path": "./discord-bot",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "./discord-bot",
|
||||
"type": "path"
|
||||
},
|
||||
"parent": [
|
||||
"noisebell"
|
||||
]
|
||||
},
|
||||
"noisebell-rss": {
|
||||
"inputs": {
|
||||
"crane": "crane_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"rust-overlay": "rust-overlay_4"
|
||||
},
|
||||
"locked": {
|
||||
"path": "./rss-service",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "./rss-service",
|
||||
"type": "path"
|
||||
},
|
||||
"parent": [
|
||||
"noisebell"
|
||||
]
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
|
|
@ -364,7 +231,6 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noisebell",
|
||||
"noisebell-cache",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
|
|
@ -384,51 +250,7 @@
|
|||
},
|
||||
"rust-overlay_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noisebell",
|
||||
"noisebell-discord",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773115373,
|
||||
"narHash": "sha256-bfK9FJFcQth6f3ydYggS5m0z2NRGF/PY6Y2XgZDJ6pg=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "1924b4672a2b8e4aee6e6652ec2e59a8d3c5648e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay_4": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"noisebell",
|
||||
"noisebell-rss",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773115373,
|
||||
"narHash": "sha256-bfK9FJFcQth6f3ydYggS5m0z2NRGF/PY6Y2XgZDJ6pg=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "1924b4672a2b8e4aee6e6652ec2e59a8d3c5648e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay_5": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772679930,
|
||||
|
|
@ -480,14 +302,14 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay_5"
|
||||
"rust-overlay": "rust-overlay_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773113843,
|
||||
"narHash": "sha256-jReomoePb3G0W4K6PzLsw0XQ8O+7pywQ7K1gMFBhQKY=",
|
||||
"lastModified": 1773122265,
|
||||
"narHash": "sha256-IabOU8CXpx16GwN7ssWtwCZpbrdeWfoBCOWWaRELHbw=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "44da77246df58c1f4c8c53771ac8eae1b4a651ca",
|
||||
"revCount": 29,
|
||||
"rev": "99715f6105abbdb5959eac7956cbf9eea4adccff",
|
||||
"revCount": 31,
|
||||
"type": "git",
|
||||
"url": "https://git.extremist.software/jet/website"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
users.groups.noisebell = {};
|
||||
users.users.noisebell-cache.extraGroups = [ "noisebell" ];
|
||||
users.users.noisebell-discord.extraGroups = [ "noisebell" ];
|
||||
users.users.noisebell-rss.extraGroups = [ "noisebell" ];
|
||||
|
||||
age.secrets.noisebell-pi-api-key = {
|
||||
file = ../secrets/noisebell-pi-api-key.age;
|
||||
|
|
@ -26,11 +25,6 @@
|
|||
group = "noisebell";
|
||||
mode = "0440";
|
||||
};
|
||||
age.secrets.noisebell-rss-webhook-secret = {
|
||||
file = ../secrets/noisebell-rss-webhook-secret.age;
|
||||
group = "noisebell";
|
||||
mode = "0440";
|
||||
};
|
||||
|
||||
services.noisebell-cache = {
|
||||
enable = true;
|
||||
|
|
@ -41,7 +35,6 @@
|
|||
inboundApiKeyFile = config.age.secrets.noisebell-inbound-api-key.path;
|
||||
outboundWebhooks = [
|
||||
{ url = "https://discord.noisebell.extremist.software/webhook"; secretFile = config.age.secrets.noisebell-discord-webhook-secret.path; }
|
||||
{ url = "https://rss.noisebell.extremist.software/webhook"; secretFile = config.age.secrets.noisebell-rss-webhook-secret.path; }
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -57,6 +50,6 @@
|
|||
services.noisebell-rss = {
|
||||
enable = true;
|
||||
domain = "rss.noisebell.extremist.software";
|
||||
webhookSecretFile = config.age.secrets.noisebell-rss-webhook-secret.path;
|
||||
cacheUrl = "http://localhost:3003";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 uKftJg DBgu0g/eKqv1JQRVd6AiQ+RHJflWlSubF7bNWlt9On8
|
||||
cMUFq8ulscBd+bmhSXj5frIkJOgmYZnyNKnGt1Uj7AA
|
||||
-> ssh-ed25519 Ziw7aw TnB6blUcqs6TLwYvcajWQEqVwd7SsRC4xxRzqAYXf24
|
||||
jKgj4MNtpfU4PVy1kaxHrFj1KqNzf5Jv8w+RXz26aFU
|
||||
--- iJ99MLPpbGA8MDHeverizU7cMHyJG958dK+Cy6YqpH4
|
||||
íöpŒZÜ%8[öAáž`ØíukúÁâ?j/ZíÅçù&ñ=uI)þ`Hz©^õp<C3B5>sSqVu¿<15>‰`G).µ®âQ8£aLz¾*ø”;
|
||||
Loading…
Add table
Add a link
Reference in a new issue