diff options
author | Florian Klink <flokli@flokli.de> | 2018-06-30 01:58:35 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2018-06-30 03:02:58 +0200 |
commit | fff5923686c21dd147bde62d08e9f1042deadb4f (patch) | |
tree | b5d25982df0045672be210e75dd923ce432cf8de /nixos/modules/services/security | |
parent | 89d5d191b48c502c84a4ed459ef3c9adc77a012a (diff) | |
download | nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.gz nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.bz2 nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.lz nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.xz nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.tar.zst nixlib-fff5923686c21dd147bde62d08e9f1042deadb4f.zip |
nixos/modules: users.(extraUsers|extraGroup->users|group)
Diffstat (limited to 'nixos/modules/services/security')
-rw-r--r-- | nixos/modules/services/security/clamav.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/security/fprot.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/security/oauth2_proxy.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/security/tor.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/security/vault.nix | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 4161c61ed375..9ad0095252de 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -79,7 +79,7 @@ in config = mkIf (cfg.updater.enable || cfg.daemon.enable) { environment.systemPackages = [ pkg ]; - users.extraUsers = singleton { + users.users = singleton { name = clamavUser; uid = config.ids.uids.clamav; group = clamavGroup; @@ -87,7 +87,7 @@ in home = stateDir; }; - users.extraGroups = singleton { + users.groups = singleton { name = clamavGroup; gid = config.ids.gids.clamav; }; diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index a12aa01503e3..b1ca4ab23452 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -53,14 +53,14 @@ in { target = "f-prot.conf"; }; - users.extraUsers = singleton + users.users = singleton { name = fprotUser; uid = config.ids.uids.fprot; description = "F-Prot daemon user"; home = stateDir; }; - users.extraGroups = singleton + users.groups = singleton { name = fprotGroup; gid = config.ids.gids.fprot; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 96d78630e6d1..0c5fe8c0ef5f 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -544,7 +544,7 @@ in cookie.secret = mkDefault null; }; - users.extraUsers.oauth2_proxy = { + users.users.oauth2_proxy = { description = "OAuth2 Proxy"; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 15200c49d70a..dcb41d187c2b 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -686,8 +686,8 @@ in always create a container/VM with a separate Tor daemon instance. ''; - users.extraGroups.tor.gid = config.ids.gids.tor; - users.extraUsers.tor = + users.groups.tor.gid = config.ids.gids.tor; + users.users.tor = { description = "Tor Daemon User"; createHome = true; home = torDirectory; diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 146afec344ab..47c70cf0687b 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -97,13 +97,13 @@ in } ]; - users.extraUsers.vault = { + users.users.vault = { name = "vault"; group = "vault"; uid = config.ids.uids.vault; description = "Vault daemon user"; }; - users.extraGroups.vault.gid = config.ids.gids.vault; + users.groups.vault.gid = config.ids.gids.vault; systemd.services.vault = { description = "Vault server daemon"; |