From f5c9fcff450fcdbd75be53fa3bcbbc55cd081b1d Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Sun, 30 May 2021 20:27:08 -0400
Subject: [PATCH] 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)
---
 nixos/tests/solanum.nix              | 8 ++++++++
 pkgs/servers/irc/solanum/default.nix | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/nixos/tests/solanum.nix b/nixos/tests/solanum.nix
index aabfb906aa8..1ecf91bce40 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 2d9035259a6..2fa85072854 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"