teamspeak switcharoo

1 files changed, 14 insertions, 25 deletions

diff --git a/modules/teamspeak/default.nix b/modules/teamspeak/default.nix
index f3e94f7..39dac10 100644
--- a/modules/teamspeak/default.nix
+++ b/modules/teamspeak/default.nix
@@ -1,52 +1,41 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   imports = [ ./teamspeak6-server.nix ];
 
   services.teamspeak3 =
     let
-      ip = "178.63.224.12"; in
+      ip = "178.63.224.12";
+    in
     {
-      enable = true;
+      enable = false;
       openFirewall = true;
       voiceIP = ip;
       queryIP = ip;
       fileTransferIP = ip;
     };
 
-  systemd.services.teamspeak3-server = {
+  systemd.services.teamspeak3-server = lib.mkIf config.services.teamspeak3.enable {
     serviceConfig = {
       Restart = lib.mkForce "always";
     };
   };
-  
+
   services.teamspeak6 =
     let
-      ip = "178.63.224.13"; in
+      ip = "178.63.224.12";
+    in
     {
       enable = true;
-      package = pkgs.callPackage ../../pkgs/teamspeak6-server {};
+      package = pkgs.callPackage ../../pkgs/teamspeak6-server { };
       openFirewall = true;
       voiceIP = ip;
       queryIP = ip;
       fileTransferIP = ip;
     };
-
-  # virtualisation.oci-containers.containers = {
-  #   teamspeak6-server = {
-  #     image = "teamspeaksystems/teamspeak6-server:latest";
-  #     autoStart = true;
-  #     ports = [
-  #       "178.63.224.13:9987:9987/udp"    # Default voice port
-  #     	"178.63.224.13:30033:30033/tcp"  # File transfer port
-  #     ];
-  #     environment = {
-  #       TSSERVER_LICENSE_ACCEPTED="accept";
-  #       TSSERVER_DEFAULT_PORT="9987";
-  #       TSSERVER_VOICE_IP="0.0.0.0";
-  #       TSSERVER_FILE_TRANSFER_PORT="30033";
-  #       TSSERVER_FILE_TRANSFER_IP="0.0.0.0";
-  #     };
-  #   };
-  # };
 }