diff options
author | Ryan Mulligan <ryan@ryantm.com> | 2015-10-03 05:48:46 -0700 |
---|---|---|
committer | Ryan Mulligan <ryan@ryantm.com> | 2015-10-03 05:48:46 -0700 |
commit | a41d07074d3934aa25bedb5d7e67983f5179a91d (patch) | |
tree | e5dce0b13587d5dfa95a39d72e6f18f2bdcf9ea6 /nixos/modules/services/misc/calibre-server.nix | |
parent | 9c22cd380cce15f624d4e1b2d953c49304a46a1d (diff) | |
download | nixlib-a41d07074d3934aa25bedb5d7e67983f5179a91d.tar nixlib-a41d07074d3934aa25bedb5d7e67983f5179a91d.tar.gz nixlib-a41d07074d3934aa25bedb5d7e67983f5179a91d.tar.bz2 nixlib-a41d07074d3934aa25bedb5d7e67983f5179a91d.tar.lz nixlib-a41d07074d3934aa25bedb5d7e67983f5179a91d.tar.xz nixlib-a41d07074d3934aa25bedb5d7e67983f5179a91d.tar.zst nixlib-a41d07074d3934aa25bedb5d7e67983f5179a91d.zip |
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
Diffstat (limited to 'nixos/modules/services/misc/calibre-server.nix')
-rw-r--r-- | nixos/modules/services/misc/calibre-server.nix | 29 |
1 files 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; - }); + }; }; |