From d39ae5050c81bb0cfea950ba57d32bc8c6304d37 Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Wed, 13 Nov 2024 19:48:02 +0100
Subject: Use IP and domain from `me.tailscale` for services

Signed-off-by: Mel <einebeere@gmail.com>
---
 services/gamja.nix | 8 +++++---
 services/soju.nix  | 7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'services')

diff --git a/services/gamja.nix b/services/gamja.nix
index 401626a..e4cc7ff 100644
--- a/services/gamja.nix
+++ b/services/gamja.nix
@@ -1,9 +1,11 @@
-{ pkgs, ... }:
+{ me, pkgs, ... }:
 
 let
+  socketPort = "3030";
+
   gamjaConfig = {
      server = {
-       url = "wss://renard.serval-moth.ts.net/gamja/socket";
+       url = "wss://${me.tailscale.domain}/gamja/socket";
        auth = "mandatory";
        nick = "mel";
      };
@@ -19,7 +21,7 @@ in
     "/gamja/" = { alias = "${gamja}/"; };
 
     "/gamja/socket" = {
-      proxyPass = "http://100.75.17.75:3030";
+      proxyPass = "http://${me.tailscale.ip}:${socketPort}";
       proxyWebsockets = true;
       recommendedProxySettings = true;
     };
diff --git a/services/soju.nix b/services/soju.nix
index 3fd64cf..2ee336d 100644
--- a/services/soju.nix
+++ b/services/soju.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ me, pkgs, ... }:
 
 let
   inherit (pkgs) dockerTools soju;
@@ -35,9 +35,8 @@ in
       imageFile = sojuImage;
       image = "soju:${soju.version}";
       ports = [
-        # TODO: take tailnet ip from `me`.
-        "100.75.17.75:${ircPort}:${ircPort}"
-        "100.75.17.75:${socketPort}:${socketPort}"
+        "${me.tailscale.ip}:${ircPort}:${ircPort}"
+        "${me.tailscale.ip}:${socketPort}:${socketPort}"
       ];
 
       volumes = [
-- 
cgit 1.4.1