From 21e96199bbeb28f5118389b2cc2dd77206d88584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 20 Sep 2023 14:43:04 +0300
Subject: [PATCH] deployerbot: use vpn for actual deploying anyway

---
 hosts/fwminex/configuration.nix          | 2 +-
 hosts/vno1-oh2/configuration.nix         | 2 +-
 modules/services/deployerbot/default.nix | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 5cddaf5..0d2032b 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -89,7 +89,7 @@ in {
           enable = true;
           uidgid = myData.uidgid.updaterbot-deployee;
           publicKey = myData.hosts."vno1-oh2.servers.jakst".publicKey;
-          sshAllowSubnets = with myData.subnets; [tailscale.sshPattern vno1.sshPattern];
+          sshAllowSubnets = with myData.subnets; [tailscale.sshPattern];
         };
       };
 
diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix
index 085fb34..8bbe691 100644
--- a/hosts/vno1-oh2/configuration.nix
+++ b/hosts/vno1-oh2/configuration.nix
@@ -189,7 +189,7 @@
           deployIfPresent = [
             {
               derivationTarget = ".#fwminex";
-              altHostname = myData.hosts."fwminex.motiejus.jakst".vno1IP;
+              pingTarget = myData.hosts."fwminex.motiejus.jakst".vno1IP;
             }
           ];
         };
diff --git a/modules/services/deployerbot/default.nix b/modules/services/deployerbot/default.nix
index 0c88f63..2647cf5 100644
--- a/modules/services/deployerbot/default.nix
+++ b/modules/services/deployerbot/default.nix
@@ -2,20 +2,18 @@
   config,
   lib,
   pkgs,
-  myData,
   ...
 }: let
   cfg = config.mj.services.deployerbot;
   mkOptional = {
     derivationTarget,
-    altHostname,
+    pingTarget,
   }: ''
-    if ${pkgs.inetutils}/bin/ping -c 1 ${altHostname}; then
+    if ${pkgs.inetutils}/bin/ping -c 1 ${pingTarget}; then
       ${pkgs.deploy-rs}/bin/deploy \
         --ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \
         --ssh-user=deployerbot-follower \
         --confirm-timeout 60 \
-        --hostname ${altHostname} \
         --targets ${derivationTarget} -- \
           --accept-flake-config
     fi
@@ -29,7 +27,7 @@ in {
         {...}: {
           options = {
             derivationTarget = lib.mkOption {type = str;};
-            altHostname = lib.mkOption {type = str;};
+            pingTarget = lib.mkOption {type = str;};
           };
         }
       ));