diff --git a/doc/manual/man-nixos-build-vms.xml b/doc/manual/man-nixos-build-vms.xml index 3bbf9defb11..1650f33064f 100644 --- a/doc/manual/man-nixos-build-vms.xml +++ b/doc/manual/man-nixos-build-vms.xml @@ -16,7 +16,7 @@ - nixos-deploy-network + nixos-build-vms @@ -47,7 +47,7 @@ users to remotely script a generated virtual machine. { services.openssh.enable = true; nixpkgs.system = "i686-linux"; - deployment.hostname = "test1.example.net"; + deployment.targetHost = "test1.example.net"; # Other NixOS options }; @@ -58,7 +58,7 @@ users to remotely script a generated virtual machine. services.httpd.enable = true; environment.systemPackages = [ pkgs.lynx ]; nixpkgs.system = "x86_64-linux"; - deployment.hostname = "test2.example.net"; + deployment.targetHost = "test2.example.net"; # Other NixOS options }; @@ -69,7 +69,8 @@ Each attribute in the expression represents a machine in the network (e.g. test1 and test2) referring to a function defining a NixOS configuration. In each NixOS configuration, two attributes have a special meaning. -The deployment.hostname specifies the hostname +The deployment.targetHost specifies the address +(domain name or IP address) of the system which is used by ssh to perform remote deployment operations. The nixpkgs.system attribute can be used to specify an architecture for the target machine, diff --git a/doc/manual/man-nixos-deploy-network.xml b/doc/manual/man-nixos-deploy-network.xml index 0a84ebefeea..2a1f78f6ff8 100644 --- a/doc/manual/man-nixos-deploy-network.xml +++ b/doc/manual/man-nixos-deploy-network.xml @@ -43,7 +43,7 @@ state. { services.openssh.enable = true; nixpkgs.system = "i686-linux"; - deployment.hostname = "test1.example.net"; + deployment.targetHost = "test1.example.net"; # Other NixOS options }; @@ -54,7 +54,7 @@ state. services.httpd.enable = true; environment.systemPackages = [ pkgs.lynx ]; nixpkgs.system = "x86_64-linux"; - deployment.hostname = "test2.example.net"; + deployment.targetHost = "test2.example.net"; # Other NixOS options }; @@ -65,7 +65,8 @@ Each attribute in the expression represents a machine in the network (e.g. test1 and test2) referring to a function defining a NixOS configuration. In each NixOS configuration, two attributes have a special meaning. -The deployment.hostname specifies the hostname +The deployment.targetHost specifies the address +(domain name or IP address) of the system which is used by ssh to perform remote deployment operations. The nixpkgs.system attribute can be used to specify an architecture for the target machine, diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix index 630be914d4b..bf2f88b831a 100644 --- a/modules/installer/tools/nixos-deploy-network/deploy.nix +++ b/modules/installer/tools/nixos-deploy-network/deploy.nix @@ -1,7 +1,7 @@ { nixos ? /etc/nixos/nixos , nixpkgs ? /etc/nixos/nixpkgs , networkExpr -, targetProperty ? "hostname" +, targetProperty ? "targetHost" }: let