diff options
author | Eric Sagnes <eric.sagnes@gmail.com> | 2016-05-09 14:53:27 +0900 |
---|---|---|
committer | Eric Sagnes <eric.sagnes@gmail.com> | 2016-08-11 00:29:48 +0900 |
commit | 4cdfeb78f9b7397304a58b83d2746fd417e00e3c (patch) | |
tree | 8d908622b68db5a3856cff8ae034715d5d986b1a /nixos/modules/services/networking/teamspeak3.nix | |
parent | 898435d16e14e18e73e00f4618e6e88bedb91399 (diff) | |
download | nixlib-4cdfeb78f9b7397304a58b83d2746fd417e00e3c.tar nixlib-4cdfeb78f9b7397304a58b83d2746fd417e00e3c.tar.gz nixlib-4cdfeb78f9b7397304a58b83d2746fd417e00e3c.tar.bz2 nixlib-4cdfeb78f9b7397304a58b83d2746fd417e00e3c.tar.lz nixlib-4cdfeb78f9b7397304a58b83d2746fd417e00e3c.tar.xz nixlib-4cdfeb78f9b7397304a58b83d2746fd417e00e3c.tar.zst nixlib-4cdfeb78f9b7397304a58b83d2746fd417e00e3c.zip |
modules: move meta at top level
Diffstat (limited to 'nixos/modules/services/networking/teamspeak3.nix')
-rw-r--r-- | nixos/modules/services/networking/teamspeak3.nix | 75 |
1 files changed, 36 insertions, 39 deletions
diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix index 5f04926eed24..3703921ff703 100644 --- a/nixos/modules/services/networking/teamspeak3.nix +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -95,47 +95,44 @@ in ###### implementation - config = mkMerge [ - (mkIf cfg.enable { - users.users.teamspeak = { - description = "Teamspeak3 voice communication server daemon"; - group = group; - uid = config.ids.uids.teamspeak; - home = cfg.dataDir; - createHome = true; - }; - - users.groups.teamspeak = { - gid = config.ids.gids.teamspeak; - }; + config = mkIf cfg.enable { + users.users.teamspeak = { + description = "Teamspeak3 voice communication server daemon"; + group = group; + uid = config.ids.uids.teamspeak; + home = cfg.dataDir; + createHome = true; + }; - systemd.services.teamspeak3-server = { - description = "Teamspeak3 voice communication server daemon"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + users.groups.teamspeak = { + gid = config.ids.gids.teamspeak; + }; - preStart = '' - mkdir -p ${cfg.logPath} - chown ${user}:${group} ${cfg.logPath} + systemd.services.teamspeak3-server = { + description = "Teamspeak3 voice communication server daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + mkdir -p ${cfg.logPath} + chown ${user}:${group} ${cfg.logPath} + ''; + + serviceConfig = { + ExecStart = '' + ${ts3}/bin/ts3server \ + dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \ + voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \ + filetransfer_ip=${cfg.fileTransferIP} filetransfer_port=${toString cfg.fileTransferPort} \ + query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort} ''; - - serviceConfig = { - ExecStart = '' - ${ts3}/bin/ts3server \ - dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \ - voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \ - filetransfer_ip=${cfg.fileTransferIP} filetransfer_port=${toString cfg.fileTransferPort} \ - query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort} - ''; - WorkingDirectory = cfg.dataDir; - User = user; - Group = group; - PermissionsStartOnly = true; - }; + WorkingDirectory = cfg.dataDir; + User = user; + Group = group; + PermissionsStartOnly = true; }; - }) - { - meta.maintainers = with lib.maintainers; [ arobyn ]; - } - ]; + }; + }; + + meta.maintainers = with lib.maintainers; [ arobyn ]; } |