BitlBee: Add `job.name'; cleanup white space.

svn path=/nixos/trunk/; revision=33012
This commit is contained in:
Ludovic Courtès 2012-03-12 13:10:13 +00:00
parent 7281a851b3
commit 5fad465261

View File

@ -19,28 +19,28 @@ in
services.bitlbee = { services.bitlbee = {
enable = mkOption { enable = mkOption {
default = false; default = false;
description = '' description = ''
Whether to run the BitlBee IRC to other chat network gateway. Whether to run the BitlBee IRC to other chat network gateway.
Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat
networks via an IRC client. networks via an IRC client.
''; '';
}; };
interface = mkOption { interface = mkOption {
default = "127.0.0.1"; default = "127.0.0.1";
description = '' description = ''
The interface the BitlBee deamon will be listening to. If `127.0.0.1', The interface the BitlBee deamon will be listening to. If `127.0.0.1',
only clients on the local host can connect to it; if `0.0.0.0', clients only clients on the local host can connect to it; if `0.0.0.0', clients
can access it from any network interface. can access it from any network interface.
''; '';
}; };
portNumber = mkOption { portNumber = mkOption {
default = 6667; default = 6667;
description = '' description = ''
Number of the port BitlBee will be listening to. Number of the port BitlBee will be listening to.
''; '';
}; };
}; };
@ -54,35 +54,36 @@ in
users.extraUsers = singleton users.extraUsers = singleton
{ name = "bitlbee"; { name = "bitlbee";
uid = bitlbeeUid; uid = bitlbeeUid;
description = "BitlBee user"; description = "BitlBee user";
home = "/var/empty"; home = "/var/empty";
}; };
users.extraGroups = singleton users.extraGroups = singleton
{ name = "bitlbee"; { name = "bitlbee";
gid = config.ids.gids.bitlbee; gid = config.ids.gids.bitlbee;
}; };
jobs.bitlbee = jobs.bitlbee =
{ description = "BitlBee IRC to other chat networks gateway"; { description = "BitlBee IRC to other chat networks gateway";
name = "bitlbee";
startOn = "ip-up"; startOn = "ip-up";
preStart = preStart =
'' ''
if ! test -d /var/lib/bitlbee if ! test -d /var/lib/bitlbee
then then
mkdir -p /var/lib/bitlbee mkdir -p /var/lib/bitlbee
chown bitlbee:bitlbee /var/lib/bitlbee chown bitlbee:bitlbee /var/lib/bitlbee
fi fi
''; '';
exec = exec =
'' ''
${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \ ${pkgs.bitlbee}/sbin/bitlbee -F -p ${toString portNumber} \
-i ${interface} -u bitlbee -i ${interface} -u bitlbee
''; '';
}; };
environment.systemPackages = [ pkgs.bitlbee ]; environment.systemPackages = [ pkgs.bitlbee ];