makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

nix-community: split mediawiki-matrix-bot into legacy and normal

Browse source
This commit is contained in:
makefu 2024-05-11 02:06:15 +02:00
parent 5d30fa3e50
commit 7d59d97c0d
No known key found for this signature in database
GPG key ID: 36F7711F3FC0F225
4 changed files with 38 additions and 9 deletions
2configs/nix-community
legacy-mediawiki-matrix-bot.nixmediawiki-matrix-bot.nixsupervision.nix
sops/secrets/mediawikibot-config-nixos.wiki.json
secret

25
2configs/nix-community/legacy-mediawiki-matrix-bot.nix Normal file
View file

@ -0,0 +1,25 @@
{ pkgs, config, ... }:
{
sops.secrets."mediawikibot-config-nixos.wiki.json" = {
mode = "0440";
group = config.users.groups.mediawiki.name;
};
users.groups.mediawiki = {};
systemd.services.mediawiki-matrix-bot-nixos-wiki = {
description = "Mediawiki Matrix Bot (nixos.wiki)";
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "always";
RestartSec = "60s";
DynamicUser = true;
StateDirectory = "mediawiki-matrix-bot-nixos.wiki";
SupplementaryGroups = [ config.users.groups.mediawiki.name ];
ExecStart = "${pkgs.mediawiki-matrix-bot}/bin/mediawiki-matrix-bot ${config.sops.secrets."mediawikibot-config-nixos.wiki.json".path}";
PrivateTmp = true;
};
};
}

10
2configs/nix-community/mediawiki-matrix-bot.nix
View file

@ -1,24 +1,24 @@
{ pkgs, config, ... }:
{
sops.secrets."mediawikibot-config.json" = {
sops.secrets."mediawikibot-config-nixos.org.json" = {
mode = "0440";
group = config.users.groups.mediawiki.name;
};
users.groups.mediawiki = {};
systemd.services.mediawiki-matrix-bot = {
description = "Mediawiki Matrix Bot";
systemd.services.mediawiki-matrix-bot-nixos-org = {
description = "Mediawiki Matrix Bot (nixos.org)";
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "always";
RestartSec = "60s";
DynamicUser = true;
StateDirectory = "mediawiki-matrix-bot";
StateDirectory = "mediawiki-matrix-bot-nixos.org";
SupplementaryGroups = [ config.users.groups.mediawiki.name ];
ExecStart = "${pkgs.mediawiki-matrix-bot}/bin/mediawiki-matrix-bot ${config.sops.secrets."mediawikibot-config.json".path}";
ExecStart = "${pkgs.mediawiki-matrix-bot}/bin/mediawiki-matrix-bot ${config.sops.secrets."mediawikibot-config-nixos.org.json".path}";
PrivateTmp = true;
};
};

4
2configs/nix-community/supervision.nix
View file

@ -27,12 +27,12 @@ in {
data_format = "influx";
file_tag = "name";
files = [ "/var/log/telegraf/*" ];
}] ++ lib.optional (lib.any (fs: fs == "ext4") config.boot.supportedFilesystems) {
}] ++ lib.optional (config.boot.supportedFilesystems ? "ext4") {
name_override = "ext4_errors";
files = [ "/sys/fs/ext4/*/errors_count" ];
data_format = "value";
};
exec = lib.optionalAttrs (lib.any (fs: fs == "zfs") config.boot.supportedFilesystems) {
exec = lib.optionalAttrs (config.boot.supportedFilesystems ? "zfs") {
## Commands array
commands = [
(pkgs.writeScript "zpool-health" ''

8
sops/secrets/mediawikibot-config-nixos.wiki.json/secret
View file

@ -8,11 +8,15 @@
"age": [
{
"recipient": "age13ekyvn5ux7zyvclwlrpnhgauw5s6dzn538msjka8vpwhu535ychqa7dk7a",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBM1dzZjJtUFkxTGpMVzlq\ncmV4OXozWlBZRE4yOC9YbHpEM2d5d1VGb3djCnlPTW16RHMrWlBZOFBweTVWRWVx\nOUY4KytLQW5GcWg4SzNqR0l5dERmbmMKLS0tIGxCMEtYQ3lmS0JxN0JONzVtVkNi\ncVlqaTdkbXEyNUhKeTl4WElJY3FIWkkKrMry0Kozvr/bqXIr+DZIeCBVKTSBvLJh\nDgR9Pfq4JPEuNkRwJcK8/RMt74CPLi+zQVJzkMv9uzO9kYudfcMNwg==\n-----END AGE ENCRYPTED FILE-----\n"
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjWmdYSExnTTdQeUxyeUVp\nN3NWL2JZRmRReXJvN2RSS3Qzell6QXBoM1NZCk1pS0dBczllVjNCT2V0dVFVQ2Vs\nQ1hGL1RkeWJTVHlReVFrSFhPaUtmWVUKLS0tIHZ2TkwybHdBL2w3bGhGTXhsV2Jq\nTlIvaVY1SnJtSWlzcmNMRnYxNENHc0UKW1nthcetUd+EtXQuNJ9/4pbO4jlbj4A6\nBsHeVS91mSBiLKCddgj2VFIwwz2HOurdxA+LLSYQkLuf3XPAzc8xhw==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age1g0h4fhgnfr7zvp3mqa32u24k4nlfpqmk4dvl5pwnj7t3m6zl2cfs3mw7ht",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCRitrakZpSmgxZHh3RjZu\nQlFMZjBIR1UxSklOWEhBUFpXTjcvQXZUMkhjCkYrL3loRW4yQWJYSndoaFpxWFpG\nWUxDeVlwVVA5TEJUTmJLcFVIdHlUMzQKLS0tIEYzaktXL041bGFxcHRmUG5aTVRi\nMmxRRkxSdnhtTkJGZU9lSjJWcDllaEEKT7aHVgpbh5oF7LYsaWl289vhlFl0NSog\n4aYRHsPth+Ni4t4zD1VfvV6uufceM+hDGhi1nZffFvmPSMbuotZIzg==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age1vh6qdlxzfsy8gquvzwsfz40ezkx9m5m9q8sj4225nh3mr9lrjvrqt079mp",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4cm1ZNFpDT1BoR1Y1K1cr\nWVoyQlVPZHpSKzM3OUJqYnFyOGd1Y1QvckNFCjcxSGZ0aE1UdEZ4bnVua1V6T2Nr\ndzF0cEk5REFmQVdINmxHMUpNRklVYTAKLS0tIFNEVklHMWYyS1k0NU41MGYwdC9Z\neWNmOVpxeGhGN2FrRk9hN0hSRzlaR0UK1NdAf7ijZhoinsOIEII6q/rRDHG8/3Y7\ns57znJwRjzUGI+omV5LCh6vX21EqILkFvCjc7W887eyhn8Eby37Y3g==\n-----END AGE ENCRYPTED FILE-----\n"
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnY2FEbEh5bVZpcCtQc2tD\nVGcwdXRJRTM5Nm54a3hNOGZsUGJOY3hYNDJnCk01Q1lFSkc5RGhic1hzb3JEeVFy\nUDRMSmdwcWlGekU2aTFiY0oyZjdLWTQKLS0tIFFPbys3NFpFTlc2N2x0WGYrY1hu\nYU9uZU9ybm84cEVvN1BQcnZGSWcrY0kK8+e75+l0W9c30xnBSI3KacsYwJl+KwDN\njDSSH+GfkY9yrY0XZpbcFl5xUinyJbrEWFhB/XGN6KwVo9wsIdgzLQ==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2024-05-10T23:55:14Z",