From 76b7dea8059ae9b64a217c98fcade20b84df8445 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Mon, 6 May 2013 10:49:23 -0400
Subject: [PATCH] Make nginx uid and gid optional.

---
 modules/misc/ids.nix                           |  2 ++
 modules/services/web-servers/nginx/default.nix | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 2cb1ffe4429..fd76dfc47a1 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -74,6 +74,7 @@ in
     wwwrun = 54;
     spamd = 56;
     nslcd = 58;
+    nginx = 60;
 
     # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -131,6 +132,7 @@ in
     networkmanager = 57;
     nslcd = 58;
     scanner = 59;
+    nginx = 60;
 
     # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/modules/services/web-servers/nginx/default.nix b/modules/services/web-servers/nginx/default.nix
index 03f37d3518e..da08751d0b5 100644
--- a/modules/services/web-servers/nginx/default.nix
+++ b/modules/services/web-servers/nginx/default.nix
@@ -74,10 +74,14 @@ in
       };
     };
 
-    users.extraUsers.nginx = {
+    users.extraUsers = optionalAttrs (cfg.user == "nginx") singleton
+    { name = "nginx";
       group = "nginx";
+      uid = config.ids.uids.nginx;
     };
 
-    users.extraGroups.nginx = {};
-  };
+    users.extraGroups = optionalAttrs (cfg.group == "nginx") singleton
+    { name = "nginx";
+      gid = config.ids.gids.nginx;
+    };
 }