move deployment bits to colmena declaration

3 files changed, 24 insertions, 16 deletions

diff --git a/flake/hosts.nix b/flake/hosts.nix
index 1ac7230..e02ff2d 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -204,8 +204,30 @@ in
           ];
         };
 
-      synology-vm = import ../machines/nixos/x86_64-linux/synology-vm;
-      do-rproxy = import ../machines/nixos/x86_64-linux/do-rproxy;
+      do-rproxy =
+        { name, ... }:
+        {
+          imports = [ ../machines/nixos/x86_64-linux/${name} ];
+          deployment = {
+            tags = [ "droplet" ];
+            targetHost = "fcuny.net";
+            targetUser = "fcuny";
+            buildOnTarget = true;
+            allowLocalDeployment = false;
+          };
+        };
+      synology-vm =
+        { name, ... }:
+        {
+          imports = [ ../machines/nixos/x86_64-linux/${name} ];
+          deployment = {
+            tags = [ "vm" ];
+            targetHost = "vm-synology";
+            targetUser = "fcuny";
+            buildOnTarget = true;
+            allowLocalDeployment = false;
+          };
+        };
     };
   };
 }
diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix
index f308e79..e187bd2 100644
--- a/machines/nixos/x86_64-linux/do-rproxy/default.nix
+++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix
@@ -36,13 +36,6 @@
     ./profiles/nginx.nix
   ];
 
-  deployment = {
-    targetHost = "code.fcuny.net"; # I need to fix the mismatch
-    targetUser = "fcuny";
-    buildOnTarget = true;
-    allowLocalDeployment = false;
-  };
-
   # do not use DHCP, as DigitalOcean provisions IPs using cloud-init
   networking.useDHCP = lib.mkForce false;
 
diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix
index 47a4a60..9316432 100644
--- a/machines/nixos/x86_64-linux/synology-vm/default.nix
+++ b/machines/nixos/x86_64-linux/synology-vm/default.nix
@@ -33,13 +33,6 @@
     ./profiles/goget.nix
   ];
 
-  deployment = {
-    targetHost = "vm-synology"; # I need to fix the mismatch
-    targetUser = "fcuny";
-    buildOnTarget = true;
-    allowLocalDeployment = false;
-  };
-
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot.enable = true;