Merge pull request #47902 from pvgoran/correct-mkEnableOption-uses

nixos: correct improper uses of mkEnableOption, clarify service descr…
This commit is contained in:
Silvan Mosberger 2018-10-11 21:31:32 +02:00 committed by GitHub
commit c881a04a5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {