[ARVADOS] updated: c378aa30f0942a58f3f504edf61233296d671eff
git at public.curoverse.com
git at public.curoverse.com
Wed Jul 30 10:33:10 EDT 2014
Summary of changes:
apps/workbench/app/controllers/users_controller.rb | 5 +
.../app/views/users/_add_ssh_key_popup.html.erb | 8 +-
.../app/views/users/add_ssh_key_popup.js.erb | 13 +-
doc/_config.yml | 1 +
doc/_includes/_alert_docker.liquid | 4 -
doc/install/index.html.textile.liquid | 2 -
doc/install/install-docker.html.textile.liquid | 94 ++++++------
.../check-environment.html.textile.liquid | 2 +-
docker/api/Dockerfile | 37 ++++-
docker/api/application.yml.in | 5 +
docker/api/apt.arvados.org.list | 2 +
docker/api/arvados-clients.yml.in | 5 +
docker/api/crunch-dispatch-run.sh | 24 +++
docker/api/keep_server_0.json | 6 +
docker/api/keep_server_1.json | 7 +
docker/api/munge.key | Bin 0 -> 1024 bytes
docker/api/setup-gitolite.sh.in | 77 ++++++++++
docker/api/setup.sh.in | 62 ++++++++
docker/api/slurm.conf.in | 60 ++++++++
docker/api/supervisor.conf | 29 ++++
docker/api/update-gitolite.rb | 162 +++++++++++++++++++++
docker/arvdock | 120 ++++++++++++---
docker/base/Dockerfile | 4 +
docker/base/apt.arvados.org.list | 2 +
docker/build.sh | 32 +++-
docker/build_tools/Makefile | 143 ++++++++++++++++--
docker/build_tools/build.rb | 28 +++-
docker/compute/Dockerfile | 28 ++++
docker/compute/fuse.conf | 10 ++
docker/compute/setup.sh.in | 20 +++
docker/{api => compute}/ssh.sh | 0
docker/compute/supervisor.conf | 29 ++++
docker/compute/wrapdocker | 90 ++++++++++++
docker/config.yml.example | 4 +
docker/shell/Dockerfile | 19 +++
docker/shell/fuse.conf | 10 ++
docker/shell/setup.sh.in | 21 +++
docker/{api => shell}/superuser_token.in | 0
docker/shell/supervisor.conf | 15 ++
docker/slurm/Dockerfile | 11 ++
docker/slurm/munge.key | Bin 0 -> 1024 bytes
docker/slurm/slurm.conf.in | 60 ++++++++
docker/slurm/supervisor.conf | 14 ++
docker/workbench/Dockerfile | 3 +
44 files changed, 1164 insertions(+), 104 deletions(-)
delete mode 100644 doc/_includes/_alert_docker.liquid
create mode 100644 docker/api/apt.arvados.org.list
create mode 100644 docker/api/arvados-clients.yml.in
create mode 100755 docker/api/crunch-dispatch-run.sh
create mode 100644 docker/api/keep_server_0.json
create mode 100644 docker/api/keep_server_1.json
create mode 100644 docker/api/munge.key
create mode 100755 docker/api/setup-gitolite.sh.in
create mode 100755 docker/api/setup.sh.in
create mode 100644 docker/api/slurm.conf.in
create mode 100755 docker/api/update-gitolite.rb
create mode 100644 docker/base/apt.arvados.org.list
create mode 100644 docker/compute/Dockerfile
create mode 100644 docker/compute/fuse.conf
create mode 100755 docker/compute/setup.sh.in
copy docker/{api => compute}/ssh.sh (100%)
create mode 100644 docker/compute/supervisor.conf
create mode 100755 docker/compute/wrapdocker
create mode 100644 docker/shell/Dockerfile
create mode 100644 docker/shell/fuse.conf
create mode 100755 docker/shell/setup.sh.in
copy docker/{api => shell}/superuser_token.in (100%)
create mode 100644 docker/shell/supervisor.conf
create mode 100644 docker/slurm/Dockerfile
create mode 100644 docker/slurm/munge.key
create mode 100644 docker/slurm/slurm.conf.in
create mode 100644 docker/slurm/supervisor.conf
via c378aa30f0942a58f3f504edf61233296d671eff (commit)
via 1b452d6b3903bac1ccd71b2bb2d9884ae1274f44 (commit)
via 4f78624e3134bdf838d219e1a983dda0945e70c9 (commit)
via 4426418ecff6f1281da5915a84e30b1f4ce7c9db (commit)
via 735d69e66e208bbc5c49d6276c74dc66bf181efe (commit)
via 6d3636939f60a96d8ede920fec474079d713c7e1 (commit)
via 82c23c04e3105dfd0d2167a53552df56b0a81785 (commit)
via 360b5d19eb0cb595fd34d11aa6426d95b3c974d4 (commit)
via 386aae039eaa8007dace4328b0dfd132256a79a5 (commit)
via 5e062b44d6b9ebb70a7b0708436eb463b5e8ae7b (commit)
via ba4d612f8448337f555d369ec383d9b4cc055e79 (commit)
via aaafb72c1efb215dd6f6008c98a28f13f850b7fa (commit)
via 69369eeb2d11290f7ff21a2e2b903390fd3d3369 (commit)
via ff1b1d43022df59f80aff7384fc1903c5637ffb9 (commit)
via 190d0f110dab5d51dcfa7b13ff658583fdd21a5d (commit)
via 97f3ab858482c9d68972fa0fe3cb887d7968fcc7 (commit)
via 18717f2285dfc992720f6d9eb1f3af0bba267916 (commit)
via 564a719cc8bb9abd6684ad1d60e73a66be2901a2 (commit)
via 33f52182ea5d0ca602ebe4dff81822ed57a3a847 (commit)
via 94c6d21aed9f33599f7d8eee29481b47b7bb99f7 (commit)
via c58d996cd35e754c56a7c223414f04d0b362c284 (commit)
via ab371a54c3522c06fbc82c9838a24c6f53122a6e (commit)
via 150f495e96c43f5d7e0df58352c5b20cc9e83ccd (commit)
via cb63ae17322aa698f6636d39f43c6ad8f35c6fc5 (commit)
via ee0896bf5bf1f7f4ebdc5168e928c28d9f06eaeb (commit)
via 031db3fcd2bbcc2d3a31345c39d7a57bf960ad69 (commit)
via 652aec8c581bb6c38bae2c98f0611b142f855e4b (commit)
from 96475eb001b8e291a4923bb27ef0b97d2d9702c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit c378aa30f0942a58f3f504edf61233296d671eff
Author: radhika <radhika at curoverse.com>
Date: Wed Jul 30 10:32:43 2014 -0400
3193: update the ssh popup to not require name.
diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 836c185..805d0d2 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -263,6 +263,11 @@ class UsersController < ApplicationController
key_params['public_key'] = params['public_key']
end
+ if !key_params['name']
+ split_key = key_params['public_key'].split
+ key_params['name'] = split_key[-1] if (split_key.size == 3)
+ end
+
new_key = AuthorizedKey.create! key_params
if new_key
format.js
diff --git a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
index 283154f..8329981 100644
--- a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
+++ b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
@@ -19,13 +19,13 @@
target: "_blank" %>
</div>
<div class="form-group">
- <label for="name">Name</label>
- <input class="form-control" id="name" maxlength="250" name="name" type="text"/>
- </div>
- <div class="form-group">
<label for="public_key">Public Key</label>
<textarea class="form-control" id="public_key" rows="4" name="public_key" type="text"/>
</div>
+ <div class="form-group">
+ <label for="name">Name</label>
+ <input class="form-control" id="name" maxlength="250" name="name" type="text"/>
+ </div>
</div>
<div class="modal-footer">
diff --git a/apps/workbench/app/views/users/add_ssh_key_popup.js.erb b/apps/workbench/app/views/users/add_ssh_key_popup.js.erb
index 148c0b2..808edd7 100644
--- a/apps/workbench/app/views/users/add_ssh_key_popup.js.erb
+++ b/apps/workbench/app/views/users/add_ssh_key_popup.js.erb
@@ -6,8 +6,7 @@ $register = $('#register');
var name_value = document.forms["add_new_key_form"]["name"].value;
var public_key_value = document.forms["add_new_key_form"]["public_key"].value;
-if ((name_value == null || name_value == "" ||
- public_key_value == null || public_key_value == "")) {
+if (public_key_value == null || public_key_value == "") {
$register.attr('disabled', true);
}
@@ -18,8 +17,14 @@ $input.on('keyup paste mouseleave onblur', function() {
var name_value = document.forms["add_new_key_form"]["name"].value;
var public_key_value = document.forms["add_new_key_form"]["public_key"].value;
- if ((name_value == null || name_value == "" ||
- public_key_value == null || public_key_value == "")){
+ var publicKeyRegExp = /^ssh-(rsa|dss) [A-Za-z0-9+\/=\+]+\b/;
+ var validKey = false;
+
+ if (publicKeyRegExp.test(public_key_value )) {
+ validKey = true;
+ }
+
+ if (public_key_value == null || public_key_value == "" || !validKey){
trigger = true;
}
commit 1b452d6b3903bac1ccd71b2bb2d9884ae1274f44
Merge: 96475eb 4f78624
Author: radhika <radhika at curoverse.com>
Date: Wed Jul 30 10:03:04 2014 -0400
Merge branch 'master' into 3193-manage-account
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list