diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-29 14:25:56 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-29 14:25:56 +0000 |
commit | dba1d48b7897c49e5df9430c6b60f17e03ec361e (patch) | |
tree | 9302f208a6232f7d1016211b66a85c63eec5f18f /modules/services/mail | |
parent | c4f50d85cb1e501f2874698fc5844af420346f5f (diff) | |
download | nixlib-dba1d48b7897c49e5df9430c6b60f17e03ec361e.tar nixlib-dba1d48b7897c49e5df9430c6b60f17e03ec361e.tar.gz nixlib-dba1d48b7897c49e5df9430c6b60f17e03ec361e.tar.bz2 nixlib-dba1d48b7897c49e5df9430c6b60f17e03ec361e.tar.lz nixlib-dba1d48b7897c49e5df9430c6b60f17e03ec361e.tar.xz nixlib-dba1d48b7897c49e5df9430c6b60f17e03ec361e.tar.zst nixlib-dba1d48b7897c49e5df9430c6b60f17e03ec361e.zip |
* Move the uid/gid mappings into a module. This allows other modules
to use it through config.ids.{uids,gids} rather than `import relative-path/ids.nix'. svn path=/nixos/branches/modular-nixos/; revision=15796
Diffstat (limited to 'modules/services/mail')
-rw-r--r-- | modules/services/mail/dovecot.nix | 5 | ||||
-rw-r--r-- | modules/services/mail/postfix.nix | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix index 7bc091deba7f..33675efef7ac 100644 --- a/modules/services/mail/dovecot.nix +++ b/modules/services/mail/dovecot.nix @@ -44,7 +44,6 @@ let startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces"; cfg = config.services.dovecot; - idList = import ../../../system/ids.nix; dovecotConf = '' @@ -112,13 +111,13 @@ mkIf config.services.dovecot.enable { users = { extraUsers = [{ name = cfg.user; - uid = idList.uids.dovecot; + uid = config.ids.uids.dovecot; description = "Dovecot user"; group = cfg.group; }]; extraGroups = [{ name = cfg.group; - gid = idList.gids.dovecot; + gid = config.ids.gids.dovecot; }]; }; diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix index b92bef666a0c..9e1ec488ae23 100644 --- a/modules/services/mail/postfix.nix +++ b/modules/services/mail/postfix.nix @@ -156,7 +156,6 @@ let user = cfg.user; group = cfg.group; setgidGroup = cfg.setgidGroup; - idList = import ../../../system/ids.nix; optionalString = pkgs.lib.optionalString; concatStringsSep = pkgs.lib.concatStringsSep; @@ -270,17 +269,17 @@ mkIf config.services.postfix.enable { extraUsers = [ { name = user; description = "Postfix mail server user"; - uid = idList.uids.postfix; + uid = config.ids.uids.postfix; group = group; } ]; extraGroups = [ { name = group; - gid = idList.gids.postfix; + gid = config.ids.gids.postfix; } { name = setgidGroup; - gid = idList.gids.postdrop; + gid = config.ids.gids.postdrop; } ]; }; |