diff options
| -rw-r--r-- | machines/renard/default.nix | 10 | ||||
| -rw-r--r-- | services/gamja.nix | 8 | ||||
| -rw-r--r-- | services/soju.nix | 7 |
3 files changed, 13 insertions, 12 deletions
diff --git a/machines/renard/default.nix b/machines/renard/default.nix index 95edff4..0169e15 100644 --- a/machines/renard/default.nix +++ b/machines/renard/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ me, pkgs, lib, ... }: { imports = [ @@ -15,7 +15,7 @@ ../../services/gamja.nix ]; - systemd.services."acme-renard.serval-moth.ts.net" = + systemd.services."acme-${me.tailscale.domain}" = let oneWeekInSeconds = 7 * 24 * 60 * 60; @@ -33,7 +33,7 @@ ${pkgs.tailscale}/bin/tailscale cert \ --cert-file certificates/fullchain.pem \ --key-file certificates/key.pem \ - renard.serval-moth.ts.net + ${me.tailscale.domain} } cut_out_certificate_authority() { @@ -108,8 +108,8 @@ "renard" = { forceSSL = true; enableACME = true; - serverName = "renard.serval-moth.ts.net"; - listenAddresses = [ "100.75.17.75" ]; + serverName = me.tailscale.domain; + listenAddresses = [ me.tailscale.ip ]; # point to the default page, for now! locations."/" = { alias = "/var/www/html/"; }; }; 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 = [ |