From 11d2cd78e0e0f433b30a80339a7e1fbec1cc073d Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 7 Dec 2010 20:13:50 +0000
Subject: [PATCH] - deployment.targetHost is now used for connecting to remote
 hosts instead of deployment.hostname. This makes more sense. - fixed error in
 the manual (nixos-deploy-network => nixos-build-vms)

svn path=/nixos/trunk/; revision=25031
---
 doc/manual/man-nixos-build-vms.xml                      | 9 +++++----
 doc/manual/man-nixos-deploy-network.xml                 | 7 ++++---
 modules/installer/tools/nixos-deploy-network/deploy.nix | 2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/manual/man-nixos-build-vms.xml b/doc/manual/man-nixos-build-vms.xml
index 3bbf9defb119..1650f33064fb 100644
--- a/doc/manual/man-nixos-build-vms.xml
+++ b/doc/manual/man-nixos-build-vms.xml
@@ -16,7 +16,7 @@
 
 <refsynopsisdiv>
   <cmdsynopsis>
-    <command>nixos-deploy-network</command>
+    <command>nixos-build-vms</command>
     <arg><option>--use-backdoor</option></arg>
     <arg><option>--show-trace</option></arg>
     <arg><option>--no-out-link</option></arg>
@@ -47,7 +47,7 @@ users to remotely script a generated virtual machine.</para>
     {
       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.</para>
       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. <varname>test1</varname> and <varname>test2</varname>)
 referring to a function defining a NixOS configuration.
 In each NixOS configuration, two attributes have a special meaning.
-The <varname>deployment.hostname</varname> specifies the hostname
+The <varname>deployment.targetHost</varname> specifies the address
+(domain name or IP address)
 of the system which is used by <command>ssh</command> to perform
 remote deployment operations. The <varname>nixpkgs.system</varname>
 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 0a84ebefeea1..2a1f78f6ff8b 100644
--- a/doc/manual/man-nixos-deploy-network.xml
+++ b/doc/manual/man-nixos-deploy-network.xml
@@ -43,7 +43,7 @@ state.</para>
     {
       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.</para>
       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. <varname>test1</varname> and <varname>test2</varname>)
 referring to a function defining a NixOS configuration.
 In each NixOS configuration, two attributes have a special meaning.
-The <varname>deployment.hostname</varname> specifies the hostname
+The <varname>deployment.targetHost</varname> specifies the address
+(domain name or IP address)
 of the system which is used by <command>ssh</command> to perform
 remote deployment operations. The <varname>nixpkgs.system</varname>
 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 630be914d4b8..bf2f88b831a8 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