sitemap: expose sitemap.xml

Author: makefu

modules/nixos-wiki/backup.nix

@@ -2,7 +2,7 @@
 let
   wikiDump = "/var/lib/mediawiki/backup/wikidump.xml.zst";
 
-  mediawiki-maintenance = pkgs.callPackage ./mediawiki-maintenance.nix {};
+  mediawiki-maintenance = pkgs.callPackage ./mediawiki-maintenance.nix { inherit config; };
 
   wiki-backup = pkgs.writeShellApplication {
     name = "wiki-backup";

modules/nixos-wiki/default.nix

@@ -5,7 +5,8 @@
   ...
 }:
 let
-  mediawiki-maintenance = pkgs.callPackage ./mediawiki-maintenance.nix {};
+  mediawiki-maintenance = pkgs.callPackage ./mediawiki-maintenance.nix { inherit config; };
+  sitemap_dir = "/var/lib/mediawiki-sitemap/";
   cfg = config.services.nixos-wiki;
 in
 {
@@ -269,21 +270,21 @@ in
       locations."=/nixos.png".alias = ./nixos.png;
       locations."=/favicon.ico".alias = ./favicon.ico;
       locations."=/robots.txt".alias = ./robots.txt;
-      locations."/sitemap/".alias = "/var/lib/mediawiki-sitemap/";
+      locations."/sitemap/".alias = sitemap_dir;
+      locations."= /sitemap.xml".alias = "${sitemap_dir}sitemap-index-mediawiki.xml";
     };
 
     systemd.tmpfiles.rules = [
-      "d 'var/lib/mediawiki-sitemap' 0750 mediawiki ${config.services.nginx.group} - -"
+      "d '${sitemap_dir}' 0750 mediawiki ${config.services.nginx.group} - -"
     ];
 
     systemd.services.wiki-sitemap = {
       startAt = "daily";
       serviceConfig = {
-        ExecStart = "${mediawiki-maintenance}/bin/mediawiki-maintenance generateSitemap.php --fspath /var/lib/mediawiki-sitemap/ --server http://${config.services.nixos-wiki.hostname} --urlpath sitemap/";
+        ExecStart = "${mediawiki-maintenance}/bin/mediawiki-maintenance generateSitemap.php --fspath ${sitemap_dir} --server http://${config.services.nixos-wiki.hostname} --urlpath sitemap/";
         User = "mediawiki";
         Type = "oneshot";
       };
     };
   };
-
 }

modules/nixos-wiki/mediawiki-maintenance.nix

@@ -1,5 +1,5 @@
 { pkgs, config, ... }:
-pkgs.runCommand "mediawiki-maintenance"
+(pkgs.runCommand "mediawiki-maintenance"
   {
     nativeBuildInputs = [ pkgs.makeWrapper ];
     preferLocalBuild = true;
@@ -9,4 +9,5 @@ pkgs.runCommand "mediawiki-maintenance"
     makeWrapper ${config.services.phpfpm.pools.mediawiki.phpPackage}/bin/php $out/bin/mediawiki-maintenance \
       --set MEDIAWIKI_CONFIG ${config.services.phpfpm.pools.mediawiki.phpEnv.MEDIAWIKI_CONFIG} \
       --add-flags ${config.services.mediawiki.finalPackage}/share/mediawiki/maintenance/run.php
-  '';
+  ''
+)