Allow global and tailnet ports in foundation

Signed-off-by: Mel <einebeere@gmail.com>

1 files changed, 15 insertions, 19 deletions

diff --git a/services/irc/soju.nix b/services/irc/soju.nix
index f6c7ff0..e5c55c1 100644
--- a/services/irc/soju.nix
+++ b/services/irc/soju.nix
@@ -4,8 +4,8 @@ let
   inherit (pkgs) dockerTools soju;
   inherit (auxiliaryPkgs) common;
 
-  ircPort = "6667";
-  socketPort = "3030";
+  ircPort = 6667;
+  socketPort = 3030;
   sojuDir = "/srv/soju";
 
   sojuImage = dockerTools.streamLayeredImage {
@@ -22,24 +22,20 @@ let
 
 in
 {
-  virtualisation.oci-containers.containers = {
-    soju = {
-      imageStream = sojuImage;
-      image = "soju:${soju.version}";
-      # TODO: allow tailscale ports in foundation
-      ports = [
-        "${me.tailscale.ip}:${ircPort}:${ircPort}"
-        "${me.tailscale.ip}:${socketPort}:${socketPort}"
-      ];
+  foundation.services.soju = {
+    image = sojuImage;
+    ports = [
+      (common.tailnetPort me ircPort)
+      (common.tailnetPort me socketPort)
+    ];
 
-      volumes = [
-        "${sojuDir}/config.in:/etc/soju/config.in"
-        "${sojuDir}/soju.db:/var/lib/soju/soju.db"
-        "${sojuDir}/logs:/var/lib/soju/logs"
-      ];
+    volumes = [
+      [ "${sojuDir}/config.in" "/etc/soju/config.in" ]
+      [ "${sojuDir}/soju.db" "/var/lib/soju/soju.db" ]
+      [ "${sojuDir}/logs" "/var/lib/soju/logs" ]
+    ];
 
-      entrypoint = "${soju}/bin/soju";
-      cmd = [ "-config" "/etc/soju/config.in" ];
-    };
+    entrypoint = "${soju}/bin/soju";
+    cmd = [ "-config" "/etc/soju/config.in" ];
   };
 }