cluster/services/fbi/default.nix

@@ -1,11 +1,6 @@
 { depot, ... }:
 
 {
-  services.fbi = {
-    nodes.host = [ "VEGAS" ];
-    nixos.host = ./host.nix;
-  };
-
   dns.records = let
     fbiAddr = [ depot.hours.VEGAS.interfaces.primary.addrPublic ];
   in {

cluster/services/reflex/default.nix

@@ -1,10 +1,5 @@
 { depot, ... }:
 
 {
-  services.reflex = {
-    nodes.host = [ "VEGAS" ];
-    nixos.host = ./host.nix;
-  };
-
   dns.records.reflex.target = [ depot.hours.VEGAS.interfaces.primary.addrPublic ];
 }

cluster/services/soda/default.nix

@@ -1,11 +1,6 @@
 { depot, ... }:
 
 {
-  services.soda = {
-    nodes.host = [ "VEGAS" ];
-    nixos.host = ./host.nix;
-  };
-
   monitoring.blackbox.targets.soda-machine = {
     address = "soda.int.${depot.lib.meta.domain}:22";
     module = "sshConnect";

cluster/services/soda/host.nix

@@ -1,26 +0,0 @@
-{ depot, ... }:
-
-{
-  containers.soda = {
-    path = depot.nixosConfigurations.soda.config.system.build.toplevel;
-    privateNetwork = true;
-    hostBridge = "vmdefault";
-    localAddress = "${depot.hours.soda.interfaces.primary.addr}/24";
-    autoStart = true;
-    bindMounts.sodaDir = {
-      hostPath = "/srv/storage/www/soda";
-      mountPoint = "/soda";
-      isReadOnly = false;
-    };
-  };
-
-  systemd.services."container@soda".after = [ "libvirtd.service" "sys-devices-virtual-net-vmdefault.device" ];
-
-  networking.nat.forwardPorts = [
-    {
-      sourcePort = 52222;
-      destination = "${depot.hours.soda.interfaces.primary.addr}:22";
-      proto = "tcp";
-    }
-  ];
-}

hosts/VEGAS/services/backbone-routing/default.nix

@@ -3,6 +3,10 @@ let
   inherit (config.reflection) interfaces;
 in
 {
+  imports = [
+    ./port-forward.nix
+  ];
+
   networking.nat = {
     enable = true;
     externalInterface = interfaces.primary.link;

hosts/VEGAS/services/backbone-routing/port-forward.nix

@@ -0,0 +1,11 @@
+{ depot, ... }:
+
+{
+  networking.nat.forwardPorts = [
+    {
+      sourcePort = 52222;
+      destination = "${depot.hours.soda.interfaces.primary.addr}:22";
+      proto = "tcp";
+    }
+  ];
+}

hosts/VEGAS/system.nix

@@ -18,10 +18,12 @@
       ./services/backbone-routing
       ./services/bitwarden
       ./services/cdn-shield
+      ./services/fbi
       ./services/gitlab
       ./services/jokes
       ./services/mail
       ./services/minecraft
+      ./services/reflex
       ./services/sso
       ./services/websites
       ./services/wireguard-server
@@ -88,4 +90,18 @@
 
   system.stateVersion = "21.05";
   services.openssh.settings.PasswordAuthentication = false;
+
+  containers.soda = {
+    path = depot.nixosConfigurations.soda.config.system.build.toplevel;
+    privateNetwork = true;
+    hostBridge = "vmdefault";
+    localAddress = "${depot.hours.soda.interfaces.primary.addr}/24";
+    autoStart = true;
+    bindMounts.sodaDir = {
+      hostPath = "/srv/storage/www/soda";
+      mountPoint = "/soda";
+      isReadOnly = false;
+    };
+  };
+  systemd.services."container@soda".after = [ "libvirtd.service" "sys-devices-virtual-net-vmdefault.device" ];
 }