From a41d07074d3934aa25bedb5d7e67983f5179a91d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 3 Oct 2015 05:48:46 -0700
Subject: [PATCH] calibre-server service: configuration improvements

based on @eldostra feedback:
* remove user and group configuration, because it is probably
  unnecessary
* remove libraryDir default
* capitalize and shorten service description
---
 .../modules/services/misc/calibre-server.nix  | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix
index a59e68edd84d..b8648770ff4d 100644
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixos/modules/services/misc/calibre-server.nix
@@ -19,24 +19,11 @@ in
       enable = mkEnableOption "calibre-server";
 
       libraryDir = mkOption {
-        default = "/tmp/calibre-server";
         description = ''
           The directory where the Calibre library to serve is.
           '';
       };
 
-      user = mkOption {
-        type = types.str;
-        default = "calibre-server";
-        description = "User account under which calibre-server runs.";
-      };
-
-      group = mkOption {
-        type = types.str;
-        default = "calibre-server";
-        description = "Group account under which calibre-server runs.";
-      };
-
     };
 
   };
@@ -48,11 +35,11 @@ in
 
     systemd.services.calibre-server =
       {
-        description = "calibre-server, an OPDS server for a Calibre library";
+        description = "Calibre Server";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
-          User = "${cfg.user}";
+          User = "calibre-server";
           Restart = "always";
           ExecStart = "${pkgs.calibre}/bin/calibre-server --with-library=${cfg.libraryDir}";
         };
@@ -61,16 +48,14 @@ in
 
     environment.systemPackages = [ pkgs.calibre ];
 
-    users.extraUsers = optionalAttrs (cfg.user == "calibre-server") (singleton
-      { name = "calibre-server";
-        group = cfg.group;
+    users.extraUsers.calibre-server = {
         uid = config.ids.uids.calibre-server;
-      });
+        group = "calibre-server";
+      };
 
-    users.extraGroups = optionalAttrs (cfg.group == "calibre-server") (singleton
-      { name = "calibre-server";
+    users.extraGroups.calibre-server = {
         gid = config.ids.gids.calibre-server;
-      });
+      };
 
   };