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> (cherry picked from commit b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8)
This commit is contained in:
parent
f3df87c34e
commit
f5c9fcff45
@ -16,6 +16,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
networking.firewall.allowedTCPPorts = [ ircPort ];
|
networking.firewall.allowedTCPPorts = [ ircPort ];
|
||||||
services.solanum = {
|
services.solanum = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
motd = ''
|
||||||
|
The default MOTD doesn't contain the word "nixos" in it.
|
||||||
|
This one does.
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} // lib.listToAttrs (builtins.map (client: lib.nameValuePair client {
|
} // lib.listToAttrs (builtins.map (client: lib.nameValuePair client {
|
||||||
@ -48,6 +52,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||||||
${client}.wait_for_unit("ii")
|
${client}.wait_for_unit("ii")
|
||||||
${client}.wait_for_file("${iiDir}/${server}/out")
|
${client}.wait_for_file("${iiDir}/${server}/out")
|
||||||
''
|
''
|
||||||
|
# look for the custom text in the MOTD.
|
||||||
|
''
|
||||||
|
${client}.wait_until_succeeds("grep 'nixos' ${iiDir}/${server}/out")
|
||||||
|
''
|
||||||
# wait until first PING from server arrives before joining,
|
# wait until first PING from server arrives before joining,
|
||||||
# so we don't try it too early
|
# so we don't try it too early
|
||||||
''
|
''
|
||||||
|
@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
|
|||||||
./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
|
./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum'
|
||||||
|
'';
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--enable-epoll"
|
"--enable-epoll"
|
||||||
"--enable-ipv6"
|
"--enable-ipv6"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user