summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-21 06:39:12 +0100
committertv <tv@krebsco.de>2016-02-21 06:42:01 +0100
commitc5f18dfdfe9874ba48834447c8d3259b115c1357 (patch)
treefe287c1b75a61e80dbff3dd63b5fe094aff5c2da
parente4d427602c229a782297a74b50b2f67524e9e0d6 (diff)
tv.{charybdis,ejabberd}.user :: user
-rw-r--r--tv/3modules/charybdis/default.nix11
-rw-r--r--tv/3modules/ejabberd/default.nix16
2 files changed, 5 insertions, 22 deletions
diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix
index 0bab69529..5cb0c55b7 100644
--- a/tv/3modules/charybdis/default.nix
+++ b/tv/3modules/charybdis/default.nix
@@ -35,16 +35,7 @@ in {
default = 6697;
};
user = mkOption {
- type = types.submodule {
- options = {
- name = mkOption {
- type = types.str;
- };
- home = mkOption {
- type = types.str;
- };
- };
- };
+ type = types.user;
default = {
name = "charybdis";
home = "/var/lib/charybdis";
diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix
index 51a3060fd..4077da286 100644
--- a/tv/3modules/ejabberd/default.nix
+++ b/tv/3modules/ejabberd/default.nix
@@ -30,19 +30,11 @@ in {
default = cfg.certfile;
};
user = mkOption {
- type = types.submodule {
- options = {
- name = mkOption {
- type = types.str;
- default = "ejabberd";
- };
- home = mkOption {
- type = types.str;
- default = "/var/ejabberd";
- };
- };
+ type = types.user;
+ default = {
+ name = "ejabberd";
+ home = "/var/ejabberd";
};
- default = {};
};
};
config = lib.mkIf cfg.enable {