nixos: correct improper uses of mkEnableOption, clarify service descriptions
Several service definitions used `mkEnableOption` with text starting with "Whether to", which produced funny option descriptions like "Whether to enable Whether to run the rspamd daemon..". This commit corrects this, and adds short descriptions of services to affected service definitions.
This commit is contained in:
parent
89beaef64d
commit
858b263bf0
|
@ -79,7 +79,7 @@ in {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
krb5 = {
|
krb5 = {
|
||||||
enable = mkEnableOption "Whether to enable Kerberos V.";
|
enable = mkEnableOption "building krb5.conf, configuration file for Kerberos V";
|
||||||
|
|
||||||
kerberos = mkOption {
|
kerberos = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
|
|
|
@ -159,7 +159,7 @@ in
|
||||||
|
|
||||||
services.rspamd = {
|
services.rspamd = {
|
||||||
|
|
||||||
enable = mkEnableOption "Whether to run the rspamd daemon.";
|
enable = mkEnableOption "rspamd, the Rapid spam filtering system";
|
||||||
|
|
||||||
debug = mkOption {
|
debug = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
|
|
|
@ -5,7 +5,7 @@ with lib;
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
services.pptpd = {
|
services.pptpd = {
|
||||||
enable = mkEnableOption "Whether pptpd should be run on startup.";
|
enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon";
|
||||||
|
|
||||||
serverIp = mkOption {
|
serverIp = mkOption {
|
||||||
type = types.string;
|
type = types.string;
|
||||||
|
|
|
@ -5,7 +5,7 @@ with lib;
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
services.xl2tpd = {
|
services.xl2tpd = {
|
||||||
enable = mkEnableOption "Whether xl2tpd should be run on startup.";
|
enable = mkEnableOption "xl2tpd, the Layer 2 Tunnelling Protocol Daemon";
|
||||||
|
|
||||||
serverIp = mkOption {
|
serverIp = mkOption {
|
||||||
type = types.string;
|
type = types.string;
|
||||||
|
|
|
@ -36,7 +36,7 @@ in
|
||||||
|
|
||||||
services.xrdp = {
|
services.xrdp = {
|
||||||
|
|
||||||
enable = mkEnableOption "Whether xrdp should be run on startup.";
|
enable = mkEnableOption "xrdp, the Remote Desktop Protocol server";
|
||||||
|
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
|
|
|
@ -16,7 +16,7 @@ in
|
||||||
|
|
||||||
services.saslauthd = {
|
services.saslauthd = {
|
||||||
|
|
||||||
enable = mkEnableOption "Whether to enable the Cyrus SASL authentication daemon.";
|
enable = mkEnableOption "saslauthd, the Cyrus SASL authentication daemon";
|
||||||
|
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
default = pkgs.cyrus_sasl.bin;
|
default = pkgs.cyrus_sasl.bin;
|
||||||
|
|
|
@ -5,7 +5,7 @@ let
|
||||||
in {
|
in {
|
||||||
options = {
|
options = {
|
||||||
services.xe-guest-utilities = {
|
services.xe-guest-utilities = {
|
||||||
enable = mkEnableOption "Whether to enable the Xen guest utilities daemon.";
|
enable = mkEnableOption "the Xen guest utilities daemon";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
Loading…
Reference in a new issue