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

We don't need an explicit uid/gid. We also don't need web to depend

Browse Source 
on deluged, since it can be started before it.
This commit is contained in:
Domen Kozar 2013-02-27 20:06:10 +01:00
parent 71f4330d3f
commit bb89f2eb99
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/misc/ids.nix
View File

@ -75,7 +75,6 @@ in
wwwrun = 54; wwwrun = 54;
spamd = 56; spamd = 56;
nslcd = 58; nslcd = 58;
deluge = 60;
# When adding a uid, make sure it doesn't match an existing gid. # When adding a uid, make sure it doesn't match an existing gid.
@ -133,7 +132,6 @@ in
networkmanager = 57; networkmanager = 57;
nslcd = 58; nslcd = 58;
scanner = 59; scanner = 59;
deluge = 60;
# When adding a gid, make sure it doesn't match an existing uid. # When adding a gid, make sure it doesn't match an existing uid.

8
modules/services/torrent/deluge.nix
View File

@ -3,8 +3,6 @@
with pkgs.lib; with pkgs.lib;
let let
uid = config.ids.uids.deluge;
gid = config.ids.gids.deluge;
cfg = config.services.deluge; cfg = config.services.deluge;
cfg_web = config.services.deluge.web; cfg_web = config.services.deluge.web;
in { in {
@ -43,10 +41,9 @@ in {
}; };
systemd.services.delugeweb = mkIf cfg_web.enable { systemd.services.delugeweb = mkIf cfg_web.enable {
after = [ "network.target" "deluged.service" ]; after = [ "network.target" ];
description = "Deluge BitTorrent WebUI"; description = "Deluge BitTorrent WebUI";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "deluged.service" ];
path = [ pkgs.pythonPackages.deluge ]; path = [ pkgs.pythonPackages.deluge ];
script = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web"; script = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web";
serviceConfig.User = "deluge"; serviceConfig.User = "deluge";
@ -56,13 +53,12 @@ in {
environment.systemPackages = [ pkgs.pythonPackages.deluge ]; environment.systemPackages = [ pkgs.pythonPackages.deluge ];
users.extraUsers.deluge = { users.extraUsers.deluge = {
inherit uid;
group = "deluge"; group = "deluge";
home = "/var/lib/deluge/"; home = "/var/lib/deluge/";
createHome = true; createHome = true;
description = "Deluge Daemon user"; description = "Deluge Daemon user";
}; };
users.extraGroups.deluge.gid = gid; users.extraGroups.deluge = {};
}; };
} }