lol

solanum: fix MOTD

Previously this defaulted to the default MOTD in the solanum source
tree, and I don't want my friends to laugh at me. Includes a patch to
the tests to ensure that the MOTD is actually set.

This replicates the fix done in #109705 (solanum is a fork of charybdis,
so they share fundamental logic for this).

Signed-off-by: Christine Dodrill <me@christine.website>

+12
+8
nixos/tests/solanum.nix
··· 16 16 networking.firewall.allowedTCPPorts = [ ircPort ]; 17 17 services.solanum = { 18 18 enable = true; 19 + motd = '' 20 + The default MOTD doesn't contain the word "nixos" in it. 21 + This one does. 22 + ''; 19 23 }; 20 24 }; 21 25 } // lib.listToAttrs (builtins.map (client: lib.nameValuePair client { ··· 47 51 ${client}.systemctl("start ii") 48 52 ${client}.wait_for_unit("ii") 49 53 ${client}.wait_for_file("${iiDir}/${server}/out") 54 + '' 55 + # look for the custom text in the MOTD. 56 + '' 57 + ${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out") 50 58 '' 51 59 # wait until first PING from server arrives before joining, 52 60 # so we don't try it too early
+4
pkgs/servers/irc/solanum/default.nix
··· 25 25 ./dont-create-logdir.patch 26 26 ]; 27 27 28 + postPatch = '' 29 + substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum' 30 + ''; 31 + 28 32 configureFlags = [ 29 33 "--enable-epoll" 30 34 "--enable-ipv6"