Rename target-dns option to target

mlabs-haskell · Sep 25, 2024 · 2ca6e56 · 2ca6e56
1 parent 153d599
commit 2ca6e56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/modules/install-script/default.nix b/modules/install-script/default.nix
@@ -11,7 +11,7 @@
       enable =
         mkEnableOption "Create deployment script at `config.system.build.spoInstallScript`."
         // {default = config.spo-anywhere.enable or false;};
-      target-dns = mkOption {
+      target = mkOption {
         type = nullOr str;
         default = null;
         example = "[email protected]";
@@ -47,7 +47,7 @@
             rm -rf "$tmp_keys"
           }
 
-          target="${builtins.toString (config.spo-anywhere.install-script.target-dns or "")}"
+          target="${builtins.toString (config.spo-anywhere.install-script.target or "")}"
 
           # todo: make target optional option
 
@@ -99,7 +99,6 @@
           #   4. use scp instead
           nixos-anywhere \
             --debug \
-            --store-paths ${config.system.build.diskoScript} ${config.system.build.toplevel} \
             --kexec ${kexec-installer} \
             -i "$ssh_key" \
             --copy-host-keys \

diff --git a/tests/install-script.nix b/tests/install-script.nix
@@ -1,5 +1,4 @@
 {inputs, ...}: {
-  config,
   pkgs,
   ...
 }: let
@@ -175,7 +174,7 @@ in {
             install-script {
               imports = [installing];
               config = {
-                spo-anywhere.install-script.target-dns = "some-invalid-garbage";
+                spo-anywhere.install-script.target = "some-invalid-garbage";
               };
             }
           );
@@ -193,7 +192,7 @@ in {
             install-script {
               imports = [installing];
               config = {
-                spo-anywhere.install-script.target-dns = "root@installed";
+                spo-anywhere.install-script.target = "root@installed";
               };
             }
           );