diff options
| author | Christine Dodrill <me@christine.website> | 2021-05-30 20:27:08 -0400 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-15 22:54:15 +0000 |
| commit | f5c9fcff450fcdbd75be53fa3bcbbc55cd081b1d (patch) | |
| tree | 287ea25e51bd774eab9fd33843777b23fa3b88ae | |
| parent | Merge pull request #126370 from NixOS/backport-126245-to-release-21.05 (diff) | |
| download | nixpkgs-f5c9fcff450fcdbd75be53fa3bcbbc55cd081b1d.tar.gz | |
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)
| -rw-r--r-- | nixos/tests/solanum.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/irc/solanum/default.nix | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nixos/tests/solanum.nix b/nixos/tests/solanum.nix index aabfb906aa81..1ecf91bce40b 100644 --- a/nixos/tests/solanum.nix +++ b/nixos/tests/solanum.nix @@ -16,6 +16,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { networking.firewall.allowedTCPPorts = [ ircPort ]; services.solanum = { 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 { @@ -48,6 +52,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { ${client}.wait_for_unit("ii") ${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, # so we don't try it too early '' diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index 2d9035259a62..2fa85072854a 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { ./bandb.patch # https://github.com/solanum-ircd/solanum/issues/156 ]; + postPatch = '' + substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum' + ''; + configureFlags = [ "--enable-epoll" "--enable-ipv6" |