murmur service: welcome -> welcometext
fixed incorrect option name `welcome` to `welcometext`. joachifm added a rename for backwards compat. Closes https://github.com/NixOS/nixpkgs/pull/18570
This commit is contained in:
parent
de9546307f
commit
e330807e1f
|
@ -139,6 +139,9 @@ with lib;
|
|||
# fontconfig-ultimate
|
||||
(mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ])
|
||||
|
||||
# murmur
|
||||
(mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
|
||||
|
||||
# Options that are obsolete and have no replacement.
|
||||
(mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
|
||||
(mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
|
||||
|
|
|
@ -15,7 +15,7 @@ let
|
|||
logfile=/var/log/murmur/murmurd.log
|
||||
pidfile=${cfg.pidfile}
|
||||
|
||||
welcome="${cfg.welcome}"
|
||||
welcometext="${cfg.welcometext}"
|
||||
port=${toString cfg.port}
|
||||
|
||||
${if cfg.hostName == "" then "" else "host="+cfg.hostName}
|
||||
|
@ -84,7 +84,7 @@ in
|
|||
description = "Path to PID file for Murmur daemon.";
|
||||
};
|
||||
|
||||
welcome = mkOption {
|
||||
welcometext = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = "Welcome message for connected clients.";
|
||||
|
|
Loading…
Reference in a new issue