3 tv.*: use mkEnableOption

This commit is contained in:
tv 2015-07-13 17:36:31 +02:00
parent c27bd8af5d
commit 0345c30b1b
8 changed files with 12 additions and 45 deletions

View File

@ -21,12 +21,8 @@ let
};
api = {
# TODO inherit (lib) api.options.enable; oder so
enable = mkOption {
type = types.bool;
default = false;
description = "enable tv.consul";
};
enable = mkEnableOption "tv.consul";
dc = mkOption {
type = types.unspecified;
};

View File

@ -11,10 +11,7 @@ let
};
api = {
enable = mkOption {
type = types.bool;
default = false;
};
enable = mkEnableOption "tv.ejabberd";
certFile = mkOption {
type = types.str;

View File

@ -23,11 +23,8 @@ let
};
api = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable Git repository hosting.";
};
enable = mkEnableOption "tv.git";
cgit = mkOption {
type = types.bool;
default = true;

View File

@ -1,9 +1,7 @@
{ lib, ... }:
with lib;
let
cfg = config.tv.identity;
out = {
@ -12,10 +10,8 @@ let
};
api = {
enable = mkOption {
type = types.bool;
default = false;
};
enable = mkEnableOption "tv.identity";
self = mkOption {
type = types.unspecified;
};

View File

@ -11,10 +11,7 @@ let
};
api = {
enable = mkOption {
type = types.bool;
default = false;
};
enable = mkEnableOption "tv.iptables";
input-internet-accept-new-tcp = mkOption {
type = with types; listOf str;

View File

@ -11,11 +11,7 @@ let
};
api = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable nginx.";
};
enable = mkEnableOption "tv.nginx";
retiolum-locations = mkOption {
type = with types; listOf (attrsOf str);

View File

@ -11,11 +11,7 @@ let
};
api = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable tinc daemon for Retiolum.";
};
enable = mkEnableOption "tv.retiolum";
name = mkOption {
type = types.str;

View File

@ -7,11 +7,12 @@
with builtins;
with lib;
let
cfg = config.tv.urlwatch;
api = {
enable = mkEnableOption "tv.urlwatch";
dataDir = mkOption {
type = types.str;
default = "/var/lib/urlwatch";
@ -19,15 +20,6 @@ let
Directory where the urlwatch service should store its state.
'';
};
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the urlwatch service.
If enabled, then create a timer that calls urlwatch and sends mails
whenever something has changed or an error occurs.
'';
};
from = mkOption {
type = types.str;
default = "${cfg.user}@${config.networking.hostName}.retiolum";