diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2019-09-14 19:51:29 +0200 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-06 10:39:18 -0500 |
commit | 1d61efb7f177f7b70c467ab4940fde0a3481d4dc (patch) | |
tree | 860cce85acd87bc07aa2d11f4feac5d0df48a5c0 /nixos/modules/services/web-servers/apache-httpd/default.nix | |
parent | 6bd13ccd8e7fd1f241eb655f7112df1ed2889a3a (diff) | |
download | nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.gz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.bz2 nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.lz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.xz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.zst nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.zip |
treewide: use attrs instead of list for types.loaOf options
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd/default.nix')
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 3020fd68fc8..4460f89ec5c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -606,17 +606,17 @@ in } ]; - users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton - { name = "wwwrun"; + users.users = optionalAttrs (mainCfg.user == "wwwrun") { + wwwrun = { group = mainCfg.group; description = "Apache httpd user"; uid = config.ids.uids.wwwrun; - }); + }; + }; - users.groups = optionalAttrs (mainCfg.group == "wwwrun") (singleton - { name = "wwwrun"; - gid = config.ids.gids.wwwrun; - }); + users.groups = optionalAttrs (mainCfg.group == "wwwrun") { + wwwrun.gid = config.ids.gids.wwwrun; + }; security.acme.certs = mapAttrs (name: hostOpts: { user = mainCfg.user; |