summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-02 20:43:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-09-02 20:43:32 -0400
commitb6a91d7a4d2423eddc53a622dd97d399b03bb2fd (patch)
tree5351dab9b85611b6cdf1b78ca9bd9c06d64d58b7 /templates
parentc49bef1be8ce614a21bf7718c2469d28edf45fa4 (diff)
defer setting up ssh public key until after confirmation
Diffstat (limited to 'templates')
-rw-r--r--templates/configurators/confirmssh.hamlet6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/configurators/confirmssh.hamlet b/templates/configurators/confirmssh.hamlet
index 43d27d032..f82335ceb 100644
--- a/templates/configurators/confirmssh.hamlet
+++ b/templates/configurators/confirmssh.hamlet
@@ -4,7 +4,7 @@
<div .row-fluid>
<div .span8>
<p>
- The server has been verified to be usable.
+ The server #{sshHostName sshdata} has been verified to be usable.
$if not (rsyncOnly sshdata)
<p>
You have two options for how to use the server.
@@ -23,7 +23,7 @@
server. The server will not store other information about your #
git repository.
<div .span4>
- $if haspubkey
+ $if needsPubKey sshdata
<div .alert .alert-info>
<i .icon-info-sign></i> #
A ssh key will be installed on the server, allowing git-annex to #
@@ -35,7 +35,7 @@
<div .modal-body>
<p>
Setting up repository on the remote server. This could take a minute.
- $if haspubkey
+ $if needsPubKey sshdata
<p>
You will be prompted once more for your ssh password. A ssh key #
is being installed on the server, allowing git-annex to access it #