projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns
[arvados.git]
/
apps
/
admin
/
setup-new-user.rb
diff --git
a/apps/admin/setup-new-user.rb
b/apps/admin/setup-new-user.rb
index 61c711f57d0686819932a894dcfc8e52687cf822..ab5aa2edf31e031b4a88e65f4aaf85ba4c8537b0 100755
(executable)
--- a/
apps/admin/setup-new-user.rb
+++ b/
apps/admin/setup-new-user.rb
@@
-86,14
+86,14
@@
rescue
end
log.info { "vm uuid: " + vm[:uuid] }
end
log.info { "vm uuid: " + vm[:uuid] }
-# Look up the "
a
ll users" group (we expect uuid *-*-fffffffffffffff).
+# Look up the "
A
ll users" group (we expect uuid *-*-fffffffffffffff).
group = arv.group.list(where: {name: 'All users'})[:items].select do |g|
g[:uuid].match /-f+$/
end.first
if not group
group = arv.group.list(where: {name: 'All users'})[:items].select do |g|
g[:uuid].match /-f+$/
end.first
if not group
- abort "Could not look up the '
a
ll users' group with uuid '*-*-fffffffffffffff'. Stop."
+ abort "Could not look up the '
A
ll users' group with uuid '*-*-fffffffffffffff'. Stop."
end
end
-log.info { "\"
a
ll users\" group uuid: " + group[:uuid] }
+log.info { "\"
A
ll users\" group uuid: " + group[:uuid] }
# Look for signs the user has already been activated / set up.
# Look for signs the user has already been activated / set up.
@@
-151,7
+151,7
@@
log.info { "repo permission: " + repo_perm[:uuid] }
login_perm = arv.link.create(link: {
tail_kind: 'arvados#user',
tail_uuid: user[:uuid],
login_perm = arv.link.create(link: {
tail_kind: 'arvados#user',
tail_uuid: user[:uuid],
- head_kind: 'arvados#virtual
_m
achine',
+ head_kind: 'arvados#virtual
M
achine',
head_uuid: vm[:uuid],
link_class: 'permission',
name: 'can_login',
head_uuid: vm[:uuid],
link_class: 'permission',
name: 'can_login',