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

Merge pull request #55440 from Mic92/teamspeak 

nixos/teamspeak: ipv6 support
This commit is contained in:
Jörg Thalheim 2019-02-10 09:02:20 +00:00 committed by GitHub
parent d59f9c0e5f 6c28dd858b
commit 393b1510c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nixos/modules/services/networking/teamspeak3.nix
View File

@ -41,8 +41,9 @@ in
}; };
voiceIP = mkOption { voiceIP = mkOption {
type = types.str; type = types.nullOr types.str;
default = "0.0.0.0"; default = null;
example = "0.0.0.0";
description = '' description = ''
IP on which the server instance will listen for incoming voice connections. Defaults to any IP. IP on which the server instance will listen for incoming voice connections. Defaults to any IP.
''; '';
@ -57,8 +58,9 @@ in
}; };
fileTransferIP = mkOption { fileTransferIP = mkOption {
type = types.str; type = types.nullOr types.str;
default = "0.0.0.0"; default = null;
example = "0.0.0.0";
description = '' description = ''
IP on which the server instance will listen for incoming file transfer connections. Defaults to any IP. IP on which the server instance will listen for incoming file transfer connections. Defaults to any IP.
''; '';
@ -73,8 +75,9 @@ in
}; };
queryIP = mkOption { queryIP = mkOption {
type = types.str; type = types.nullOr types.str;
default = "0.0.0.0"; default = null;
example = "0.0.0.0";
description = '' description = ''
IP on which the server instance will listen for incoming ServerQuery connections. Defaults to any IP. IP on which the server instance will listen for incoming ServerQuery connections. Defaults to any IP.
''; '';
@ -122,9 +125,12 @@ in
ExecStart = '' ExecStart = ''
${ts3}/bin/ts3server \ ${ts3}/bin/ts3server \
dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \ dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \
voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \ ${optionalString (cfg.voiceIP != null) "voice_ip=${cfg.voiceIP}"} \
filetransfer_ip=${cfg.fileTransferIP} filetransfer_port=${toString cfg.fileTransferPort} \ default_voice_port=${toString cfg.defaultVoicePort} \
query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort} license_accepted=1 ${optionalString (cfg.fileTransferIP != null) "filetransfer_ip=${cfg.fileTransferIP}"} \
filetransfer_port=${toString cfg.fileTransferPort} \
${optionalString (cfg.queryIP != null) "query_ip=${cfg.queryIP}"} \
query_port=${toString cfg.queryPort} license_accepted=1
''; '';
WorkingDirectory = cfg.dataDir; WorkingDirectory = cfg.dataDir;
User = user; User = user;