Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2021-09-05 18:39:30 +02:00
commit a6d7d60d6f
4 changed files with 48 additions and 1 deletions

View file

@ -23,6 +23,7 @@ in {
}
<stockholm/makefu/2configs/nur.nix>
<stockholm/makefu/2configs/support-nixos.nix>
<stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
<stockholm/makefu/2configs/home-manager>
<stockholm/makefu/2configs/home-manager/cli.nix>
# <stockholm/makefu/2configs/stats/client.nix>
@ -182,7 +183,7 @@ in {
<stockholm/makefu/2configs/virtualisation/libvirt.nix>
# krebs infrastructure services
<stockholm/makefu/2configs/stats/server.nix>
# <stockholm/makefu/2configs/stats/server.nix>
];
makefu.dl-dir = "/var/download";

View file

@ -0,0 +1,23 @@
{ pkgs, ... }:
let
seccfg = toString <secrets/mediawikibot-config.json>;
statecfg = "/var/lib/mediawiki-matrix-bot/config.json";
in {
systemd.services.mediawiki-matrix-bot = {
description = "Mediawiki Matrix Bot";
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Restart = "always";
RestartSec = "60s";
DynamicUser = true;
StateDirectory = "mediawiki-matrix-bot";
PermissionsStartOnly = true;
ExecStartPre = pkgs.writeDash "mediawikibot-copy-config" ''
install -D -m644 ${seccfg} ${statecfg}
'';
ExecStart = "${pkgs.mediawiki-matrix-bot}/bin/mediawiki-matrix-bot ${statecfg}";
PrivateTmp = true;
};
};
}

View file

@ -33,6 +33,7 @@
cac-api
cac-panel
krebszones
cyberlocker-tools
ovh-zone
gen-oath-safe
cdrtools

View file

@ -0,0 +1,22 @@
{ buildPythonApplication, fetchFromGitHub, feedparser, matrix-nio, docopt, aiohttp, aiofiles,
mypy }:
buildPythonApplication rec {
pname = "mediawiki-matrix-bot";
version = "1.0.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "mediawiki-matrix-bot";
rev = "v${version}";
sha256 = "1923097j1xh34jmm0zhmvma614jcxaagj89c1fc1j2qyv14ybsvs";
};
propagatedBuildInputs = [
feedparser matrix-nio docopt aiohttp aiofiles
];
nativeBuildInputs = [
mypy
];
checkPhase = ''
mypy --strict mediawiki_matrix_bot
'';
}