containers: move port to variable

10 files changed, 74 insertions, 19 deletions

diff --git a/modules/server/virtualisation/containers/beszel-agent.nix b/modules/server/virtualisation/containers/beszel-agent.nix
index aa0e493..4e9ce35 100644
--- a/modules/server/virtualisation/containers/beszel-agent.nix
+++ b/modules/server/virtualisation/containers/beszel-agent.nix
@@ -3,10 +3,15 @@
   virtualisation.oci-containers.containers.beszel-agent = {
     image = "henrygd/beszel-agent";
     autoStart = true;
-    ports = [ "127.0.0.1:45876:45876" ];
     volumes = [ "/var/run/docker.sock:/var/run/docker.sock:ro" ];
     extraOptions = config.modules.containers.extraOptions ++ [ "--network=host" ];
 
+    ports =
+      let
+        port = builtins.toString 45876;
+      in
+      [ "127.0.0.1:${port}:${port}" ];
+
     environment = {
       PORT = "45876";
       KEY = "ssh-ed25519 ${secrets.beszel_agent_public_key}";
diff --git a/modules/server/virtualisation/containers/beszel.nix b/modules/server/virtualisation/containers/beszel.nix
index 269b4c5..5092a8a 100644
--- a/modules/server/virtualisation/containers/beszel.nix
+++ b/modules/server/virtualisation/containers/beszel.nix
@@ -1,13 +1,16 @@
 { config, ... }:
+let
+  port = builtins.toString 8083;
+in
 {
-  services.caddy.virtualHosts."beszel.fuwn.me".extraConfig = "reverse_proxy localhost:8083";
+  services.caddy.virtualHosts."beszel.fuwn.me".extraConfig = "reverse_proxy localhost:${port}";
 
   virtualisation.oci-containers.containers.beszel = {
     inherit (config.modules.containers) extraOptions;
 
     image = "henrygd/beszel";
     autoStart = true;
-    ports = [ "127.0.0.1:8083:8090" ];
+    ports = [ "127.0.0.1:${port}:8090" ];
     volumes = [ "/mnt/docker/beszel:/beszel_data" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/gigi.nix b/modules/server/virtualisation/containers/gigi.nix
index 25f5458..4f9dd95 100644
--- a/modules/server/virtualisation/containers/gigi.nix
+++ b/modules/server/virtualisation/containers/gigi.nix
@@ -1,13 +1,23 @@
 { config, ... }:
+let
+  port = 79;
+in
 {
-  networking.firewall.allowedTCPPorts = [ 79 ];
+  networking.firewall.allowedTCPPorts = [
+    port
+  ];
 
   virtualisation.oci-containers.containers.gigi = {
     inherit (config.modules.containers) extraOptions;
 
     image = "fuwn/gigi";
     autoStart = true;
-    ports = [ "79:79" ];
     volumes = [ "/mnt/docker/gigi:/gigi/.gigi" ];
+
+    ports =
+      let
+        portString = builtins.toString port;
+      in
+      [ "${portString}:${portString}" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/locus.nix b/modules/server/virtualisation/containers/locus.nix
index fa88016..ce8f942 100644
--- a/modules/server/virtualisation/containers/locus.nix
+++ b/modules/server/virtualisation/containers/locus.nix
@@ -1,17 +1,27 @@
 { config, ... }:
+let
+  port = 1965;
+in
 {
-  networking.firewall.allowedTCPPorts = [ 1965 ];
+  networking.firewall.allowedTCPPorts = [
+    port
+  ];
 
   virtualisation.oci-containers.containers.locus = {
     inherit (config.modules.containers) extraOptions;
 
     image = "ghcr.io/gemrest/locus";
     autoStart = true;
-    ports = [ "1965:1965" ];
     volumes = [ "/mnt/docker/locus:/locus/.locus" ];
     environment.HEADER_IMAGE = "https://ruu.neocities.org/images/animeHeader.gif";
     environmentFiles = [ config.sops.secrets.finnhub_token.path ];
 
+    ports =
+      let
+        portString = toString port;
+      in
+      [ "${portString}:${portString}" ];
+
     login = {
       registry = "ghcr.io";
       username = config.sops.secrets."ghcr/user".path;
diff --git a/modules/server/virtualisation/containers/mayu.nix b/modules/server/virtualisation/containers/mayu.nix
index 29273d1..72c456b 100644
--- a/modules/server/virtualisation/containers/mayu.nix
+++ b/modules/server/virtualisation/containers/mayu.nix
@@ -1,8 +1,11 @@
 { config, ... }:
+let
+  port = builtins.toString 8098;
+in
 {
   services.caddy.virtualHosts = {
-    "mayu.due.moe".extraConfig = "reverse_proxy localhost:8098";
-    "counter.due.moe".extraConfig = "reverse_proxy localhost:8098";
+    "mayu.due.moe".extraConfig = "reverse_proxy localhost:${port}";
+    "counter.due.moe".extraConfig = "reverse_proxy localhost:${port}";
   };
 
   virtualisation.oci-containers.containers.mayu = {
@@ -10,7 +13,7 @@
 
     image = "fuwn/mayu";
     autoStart = true;
-    ports = [ "127.0.0.1:8098:3000" ];
+    ports = [ "127.0.0.1:${port}:3000" ];
     volumes = [ "/mnt/docker/mayu:/mayu/data" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/momoka.nix b/modules/server/virtualisation/containers/momoka.nix
index e1c869d..cdc8699 100644
--- a/modules/server/virtualisation/containers/momoka.nix
+++ b/modules/server/virtualisation/containers/momoka.nix
@@ -1,12 +1,22 @@
 { config, ... }:
+let
+  port = 70;
+in
 {
-  networking.firewall.allowedTCPPorts = [ 70 ];
+  networking.firewall.allowedTCPPorts = [
+    port
+  ];
 
   virtualisation.oci-containers.containers.momoka = {
     inherit (config.modules.containers) extraOptions;
 
     image = "fuwn/momoka";
     autoStart = true;
-    ports = [ "70:70" ];
+
+    ports =
+      let
+        portString = builtins.toString port;
+      in
+      [ "${portString}:${portString}" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/pounce.nix b/modules/server/virtualisation/containers/pounce.nix
index 682f8d9..0197df4 100644
--- a/modules/server/virtualisation/containers/pounce.nix
+++ b/modules/server/virtualisation/containers/pounce.nix
@@ -5,8 +5,13 @@
 
     image = "fuwn/pounce";
     autoStart = true;
-    ports = [ "6697:6697" ];
     volumes = [ "/mnt/docker/pounce:/root/.config/pounce" ];
     environment.USER = "fuwn";
+
+    ports =
+      let
+        port = builtins.toString 6697;
+      in
+      [ "${port}:${port}" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/september.nix b/modules/server/virtualisation/containers/september.nix
index 68dbd2b..16a43b4 100644
--- a/modules/server/virtualisation/containers/september.nix
+++ b/modules/server/virtualisation/containers/september.nix
@@ -1,7 +1,10 @@
 { config, ... }:
+let
+  port = builtins.toString 8084;
+in
 {
   services.caddy.virtualHosts."fuwn.me".extraConfig = ''
-    reverse_proxy localhost:8084
+    reverse_proxy localhost:${port}
 
     header Onion-Location http://fuwnme4wbs5x36jjf2usedw2zscozwhazykhyfkjsmudtb7egs3mb7yd.onion{path}
 
@@ -22,7 +25,7 @@
 
     image = "fuwn/september";
     autoStart = true;
-    ports = [ "127.0.0.1:8084:80" ];
+    ports = [ "127.0.0.1:${port}:80" ];
 
     environment = {
       CONDENSE_LINKS_AT_HEADINGS = "## Quick Links,# Fuwn[.me],## Footer";
diff --git a/modules/server/virtualisation/containers/uptime-kuma.nix b/modules/server/virtualisation/containers/uptime-kuma.nix
index b3de506..c6b46b7 100644
--- a/modules/server/virtualisation/containers/uptime-kuma.nix
+++ b/modules/server/virtualisation/containers/uptime-kuma.nix
@@ -1,13 +1,16 @@
 { config, ... }:
+let
+  port = builtins.toString 8099;
+in
 {
-  services.caddy.virtualHosts."status.due.moe".extraConfig = "reverse_proxy localhost:8099";
+  services.caddy.virtualHosts."status.due.moe".extraConfig = "reverse_proxy localhost:${port}";
 
   virtualisation.oci-containers.containers.uptime-kuma = {
     inherit (config.modules.containers) extraOptions;
 
     image = "louislam/uptime-kuma";
     autoStart = true;
-    ports = [ "127.0.0.1:8099:3001" ];
+    ports = [ "127.0.0.1:${port}:3001" ];
     volumes = [ "/mnt/docker/uptime-kuma:/app/data" ];
   };
 }
diff --git a/modules/server/virtualisation/containers/wastebin.nix b/modules/server/virtualisation/containers/wastebin.nix
index 4a69fd3..8a00f67 100644
--- a/modules/server/virtualisation/containers/wastebin.nix
+++ b/modules/server/virtualisation/containers/wastebin.nix
@@ -1,13 +1,16 @@
 { config, ... }:
+let
+  port = builtins.toString 8090;
+in
 {
-  services.caddy.virtualHosts."bin.fuwn.me".extraConfig = "reverse_proxy localhost:8090";
+  services.caddy.virtualHosts."bin.fuwn.me".extraConfig = "reverse_proxy localhost:${port}";
 
   virtualisation.oci-containers.containers.bin = {
     inherit (config.modules.containers) extraOptions;
 
     image = "quxfoo/wastebin";
     autoStart = true;
-    ports = [ "127.0.0.1:8090:8088" ];
+    ports = [ "127.0.0.1:${port}:8088" ];
     volumes = [ "/mnt/docker/bin:/root/db" ];
   };
 }