about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2021-05-30 20:27:08 -0400
committerChristine Dodrill <me@christine.website>2021-05-30 20:27:08 -0400
commitb1fe9fab6fcfa4cdefe7370ba264b281e48de0f8 (patch)
tree91dfc7cbf40d596002aa155c6a124e25bf4556cc /nixos
parent2e25af3546106dc8ef62bdfd9d89a2bfa2a44174 (diff)
downloadnixlib-b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8.tar
nixlib-b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8.tar.gz
nixlib-b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8.tar.bz2
nixlib-b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8.tar.lz
nixlib-b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8.tar.xz
nixlib-b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8.tar.zst
nixlib-b1fe9fab6fcfa4cdefe7370ba264b281e48de0f8.zip
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>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/solanum.nix8
1 files changed, 8 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
         ''