Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
a6d7d60d6f
|
@ -23,6 +23,7 @@ in {
|
||||||
}
|
}
|
||||||
<stockholm/makefu/2configs/nur.nix>
|
<stockholm/makefu/2configs/nur.nix>
|
||||||
<stockholm/makefu/2configs/support-nixos.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>
|
||||||
<stockholm/makefu/2configs/home-manager/cli.nix>
|
<stockholm/makefu/2configs/home-manager/cli.nix>
|
||||||
# <stockholm/makefu/2configs/stats/client.nix>
|
# <stockholm/makefu/2configs/stats/client.nix>
|
||||||
|
@ -182,7 +183,7 @@ in {
|
||||||
<stockholm/makefu/2configs/virtualisation/libvirt.nix>
|
<stockholm/makefu/2configs/virtualisation/libvirt.nix>
|
||||||
|
|
||||||
# krebs infrastructure services
|
# krebs infrastructure services
|
||||||
<stockholm/makefu/2configs/stats/server.nix>
|
# <stockholm/makefu/2configs/stats/server.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
makefu.dl-dir = "/var/download";
|
makefu.dl-dir = "/var/download";
|
||||||
|
|
23
makefu/2configs/nix-community/mediawiki-matrix-bot.nix
Normal file
23
makefu/2configs/nix-community/mediawiki-matrix-bot.nix
Normal 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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -33,6 +33,7 @@
|
||||||
cac-api
|
cac-api
|
||||||
cac-panel
|
cac-panel
|
||||||
krebszones
|
krebszones
|
||||||
|
cyberlocker-tools
|
||||||
ovh-zone
|
ovh-zone
|
||||||
gen-oath-safe
|
gen-oath-safe
|
||||||
cdrtools
|
cdrtools
|
||||||
|
|
22
makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix
Normal file
22
makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix
Normal 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
|
||||||
|
'';
|
||||||
|
}
|
Loading…
Reference in a new issue