diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/configurators/addssh.hamlet | 29 | ||||
| -rw-r--r-- | templates/configurators/confirmssh.hamlet | 31 | ||||
| -rw-r--r-- | templates/configurators/repositories.hamlet | 2 |
3 files changed, 46 insertions, 16 deletions
diff --git a/templates/configurators/addssh.hamlet b/templates/configurators/addssh.hamlet index 3fa72d9b9..03a99fd96 100644 --- a/templates/configurators/addssh.hamlet +++ b/templates/configurators/addssh.hamlet @@ -1,13 +1,13 @@ <div .span9 .hero-unit> <h2> - Adding a remote server using ssh or rsync + Adding a remote server using ssh <p> - Clone this repository to a ssh or rsync server. Your data will be # + Clone this repository to a ssh server. Your data will be # uploaded to the server. If you set up other devices to use the same # server, they will all be kept in sync, using the server as a central # hub. <p> - You can use nearly any server that has ssh or rsync. For example, you # + You can use nearly any server that has ssh and rsync. For example, you # could use a <a href="http://linode.com/">Linode</a> or another VPS, or # an account on a friend's server. <p> @@ -25,15 +25,14 @@ ^{form} ^{authtoken} <div .form-actions> - <button .btn .btn-primary type=submit :willTest status:onclick="$('#testmodal').modal('show');"> - #{buttonText status} -$if willTest status - <div .modal .fade #testmodal> - <div .modal-header> - <h3> - Testing server ... - <div .modal-body> - <p> - Checking ssh connection to the server. This could take a minute. - <p> - You may be prompted for your password to log into the server. + <button .btn .btn-primary type=submit onclick="$('#testmodal').modal('show');"> + Check this server +<div .modal .fade #testmodal> + <div .modal-header> + <h3> + Testing server ... + <div .modal-body> + <p> + Checking ssh connection to the server. This could take a minute. + <p> + You may be prompted for your password to log into the server. diff --git a/templates/configurators/confirmssh.hamlet b/templates/configurators/confirmssh.hamlet new file mode 100644 index 000000000..75e27f708 --- /dev/null +++ b/templates/configurators/confirmssh.hamlet @@ -0,0 +1,31 @@ +<div .span9 .hero-unit> + <h2> + Ready to add remote server + <div .row-fluid> + <div .span8> + <p> + The server at #{sshHostName sshdata} has been verified to be usable. + <br> + Everything checks out! + <p> + <a .btn .btn-primary href="@{MakeSshR sshdata}" onclick="$('#setupmodal').modal('show');"> + Clone this repository to the remote server + <div .span4> + $if haspubkey + <div .alert .alert-info> + <i .icon-info-sign></i> # + <p> + A ssh key will be installed on the server, allowing git-annex to # + access it securely without a password. +<div .modal .fade #setupmodal> + <div .modal-header> + <h3> + Testing server ... + <div .modal-body> + <p> + Setting up repository on the remote server. This could take a minute. + $if haspubkey + <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 + securely without a password. diff --git a/templates/configurators/repositories.hamlet b/templates/configurators/repositories.hamlet index 06c1b3299..ee822671f 100644 --- a/templates/configurators/repositories.hamlet +++ b/templates/configurators/repositories.hamlet @@ -54,6 +54,6 @@ <i .icon-plus-sign></i> Remote server <p> Set up a repository on a remote server using # - <tt>ssh</tt> or <tt>rsync</tt>. + <tt>ssh</tt>. <p> To build your own personal cloud. |