about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2014-06-11 10:18:23 +0200
committerRob Vermaas <rob.vermaas@gmail.com>2014-06-11 10:18:37 +0200
commit08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45 (patch)
tree9ec7627de683eaba7636369b481138972bb665d1 /nixos/modules/services
parent75ec418ec805c3fd6731ef7fb47ffd78f76235c5 (diff)
downloadnixlib-08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45.tar
nixlib-08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45.tar.gz
nixlib-08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45.tar.bz2
nixlib-08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45.tar.lz
nixlib-08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45.tar.xz
nixlib-08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45.tar.zst
nixlib-08f9da2e8eb9d3da39a1f28e191bd4fb7fd2fa45.zip
Fix configuring httpd with custom user/group.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 75ec6671d156..b8359d4756b3 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -594,14 +594,14 @@ in
                      message = "SSL is enabled for HTTPD, but sslServerCert and/or sslServerKey haven't been specified."; }
                  ];
 
-    users.extraUsers = optionalAttrs (mainCfg.user == "wwwrun") singleton
+    users.extraUsers = optional (mainCfg.user == "wwwrun")
       { name = "wwwrun";
         group = "wwwrun";
         description = "Apache httpd user";
         uid = config.ids.uids.wwwrun;
       };
 
-    users.extraGroups = optionalAttrs (mainCfg.group == "wwwrun") singleton
+    users.extraGroups = optional (mainCfg.group == "wwwrun")
       { name = "wwwrun";
         gid = config.ids.gids.wwwrun;
       };