public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calibre-server service: configuration improvements

Browse Source 
based on @eldostra feedback:
* remove user and group configuration, because it is probably
  unnecessary
* remove libraryDir default
* capitalize and shorten service description
This commit is contained in:
Ryan Mulligan 2015-10-03 05:48:46 -07:00
parent 9c22cd380c
commit a41d07074d
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nixos/modules/services/misc/calibre-server.nix
View File

@ -19,24 +19,11 @@ in
enable = mkEnableOption "calibre-server"; enable = mkEnableOption "calibre-server";
libraryDir = mkOption { libraryDir = mkOption {
default = "/tmp/calibre-server";
description = '' description = ''
The directory where the Calibre library to serve is. 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 = systemd.services.calibre-server =
{ {
description = "calibre-server, an OPDS server for a Calibre library"; description = "Calibre Server";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
User = "${cfg.user}"; User = "calibre-server";
Restart = "always"; Restart = "always";
ExecStart = "${pkgs.calibre}/bin/calibre-server --with-library=${cfg.libraryDir}"; ExecStart = "${pkgs.calibre}/bin/calibre-server --with-library=${cfg.libraryDir}";
}; };
@ -61,16 +48,14 @@ in
environment.systemPackages = [ pkgs.calibre ]; environment.systemPackages = [ pkgs.calibre ];
users.extraUsers = optionalAttrs (cfg.user == "calibre-server") (singleton users.extraUsers.calibre-server = {
{ name = "calibre-server";
group = cfg.group;
uid = config.ids.uids.calibre-server; uid = config.ids.uids.calibre-server;
}); group = "calibre-server";
};
users.extraGroups = optionalAttrs (cfg.group == "calibre-server") (singleton users.extraGroups.calibre-server = {
{ name = "calibre-server";
gid = config.ids.gids.calibre-server; gid = config.ids.gids.calibre-server;
}); };
}; };