Skip to content

Commit 5b5de35

Browse files
committed
modules/nixos-wiki: move systemd options into config
1 parent a378efe commit 5b5de35

File tree

3 files changed

+29
-12
lines changed

3 files changed

+29
-12
lines changed

modules/nixos-wiki/backup.nix

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,7 @@
22
let
33
wikiDump = "/var/lib/mediawiki/backup/wikidump.xml.zst";
44

5-
mediawiki-maintenance =
6-
pkgs.runCommand "mediawiki-maintenance"
7-
{
8-
nativeBuildInputs = [ pkgs.makeWrapper ];
9-
preferLocalBuild = true;
10-
}
11-
''
12-
mkdir -p $out/bin
13-
makeWrapper ${config.services.phpfpm.pools.mediawiki.phpPackage}/bin/php $out/bin/mediawiki-maintenance \
14-
--set MEDIAWIKI_CONFIG ${config.services.phpfpm.pools.mediawiki.phpEnv.MEDIAWIKI_CONFIG} \
15-
--add-flags ${config.services.mediawiki.finalPackage}/share/mediawiki/maintenance/run.php
16-
'';
5+
mediawiki-maintenance = pkgs.callPackage ./mediawiki-maintenance.nix {};
176

187
wiki-backup = pkgs.writeShellApplication {
198
name = "wiki-backup";

modules/nixos-wiki/default.nix

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
...
66
}:
77
let
8+
mediawiki-maintenance = pkgs.callPackage ./mediawiki-maintenance.nix {};
89
cfg = config.services.nixos-wiki;
910
in
1011
{
@@ -268,6 +269,21 @@ in
268269
locations."=/nixos.png".alias = ./nixos.png;
269270
locations."=/favicon.ico".alias = ./favicon.ico;
270271
locations."=/robots.txt".alias = ./robots.txt;
272+
locations."/sitemap/".alias = "/var/lib/mediawiki-sitemap/";
273+
};
274+
275+
systemd.tmpfiles.rules = [
276+
"d 'var/lib/mediawiki-sitemap' 0750 mediawiki ${config.services.nginx.group} - -"
277+
];
278+
279+
systemd.services.wiki-sitemap = {
280+
startAt = "daily";
281+
serviceConfig = {
282+
ExecStart = "${mediawiki-maintenance}/bin/mediawiki-maintenance generateSitemap.php --fspath /var/lib/mediawiki-sitemap/ --server http://${config.services.nixos-wiki.hostname} --urlpath sitemap/";
283+
User = "mediawiki";
284+
Type = "oneshot";
285+
};
271286
};
272287
};
288+
273289
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{ pkgs, config, ... }:
2+
pkgs.runCommand "mediawiki-maintenance"
3+
{
4+
nativeBuildInputs = [ pkgs.makeWrapper ];
5+
preferLocalBuild = true;
6+
}
7+
''
8+
mkdir -p $out/bin
9+
makeWrapper ${config.services.phpfpm.pools.mediawiki.phpPackage}/bin/php $out/bin/mediawiki-maintenance \
10+
--set MEDIAWIKI_CONFIG ${config.services.phpfpm.pools.mediawiki.phpEnv.MEDIAWIKI_CONFIG} \
11+
--add-flags ${config.services.mediawiki.finalPackage}/share/mediawiki/maintenance/run.php
12+
'';

0 commit comments

Comments
 (0)