Permalink
Browse files

Better default group-authz configuration

Got rid of group setting for users in make-test-env.sh
  • Loading branch information...
1 parent b93f6c5 commit 93fb60d6c2df1b09cfc6f0f3b5bd65964d22add7 @labisso labisso committed Jun 24, 2011
@@ -9,6 +9,8 @@ in the "group01.txt" file (and so forth). You can make multiple kinds of
allocations in this manner, dropping people into different authorization groups
as you add them to the cloud.
+You should use the nimbus-edit-user tool to change a user's group membership.
+
You can have 1-15 groups (and zero groups, but that is just like disabling the
plugin entirely).
@@ -1,22 +1,26 @@
+# For logging and other side-purposes
vws.group.authz.groupname=UNLIMITED
# 0 means no restriction
+
+# Maximum currently reserved minutes at one point in time
+# If the caller has two other workspaces with 600 minutes scheduled
+# for each, the value being checked against this policy would be 1200 minutes
+# plus whatever time the current request is for.
vws.group.authz.maxReservedMinutes=0
-# 0 means no restriction
+# Maximum elapsed (finished) and currently reserved minutes at one point in time
+# If the caller has one other workspace with 600 minutes scheduled and 6000
+# minutes of recorded past usage, the value being checked against this policy
+# would be 6600 minutes plus whatever time the current request is for. This is
+# the all-time maximum usage cap.
vws.group.authz.maxElapsedReservedMinutes=0
-# 0 means no restriction
+# Maximum number of CPUs per VM instance
+#vws.group.authz.maxCPUs=2
+
+# Maximum number of running workspaces at one point in time
vws.group.authz.maxWorkspaceNumber=0
-# 0 means no restriction
+# Maximum number of workspaces per request
vws.group.authz.maxWorkspacesInGroup=0
-
-# not present means no restriction
-#vws.group.authz.imageNodeHostname=
-
-# not present means no restriction
-#vws.group.authz.imageBaseDirectory=
-
-# not present means false
-#vws.group.authz.dirHashMode=
@@ -7,9 +7,3 @@ vws.group.authz.maxElapsedReservedMinutes=20160
vws.group.authz.maxWorkspaceNumber=5
vws.group.authz.maxWorkspacesInGroup=5
-
-vws.group.authz.imageNodeHostname=example.com
-
-vws.group.authz.imageBaseDirectory=/cloud
-
-vws.group.authz.dirHashMode=true
@@ -7,9 +7,3 @@ vws.group.authz.maxElapsedReservedMinutes=0
vws.group.authz.maxWorkspaceNumber=16
vws.group.authz.maxWorkspacesInGroup=16
-
-vws.group.authz.imageNodeHostname=example.com
-
-vws.group.authz.imageBaseDirectory=/cloud
-
-vws.group.authz.dirHashMode=true
@@ -1,33 +1,14 @@
-# For logging and other side-purposes
-vws.group.authz.groupname=TESTING
+vws.group.authz.groupname=UNLIMITED
-# Maximum currently reserved minutes at one point in time
-# If the caller has two other workspaces with 600 minutes scheduled
-# for each, the value being checked against this policy would be 1200 minutes
-# plus whatever time the current request is for.
-vws.group.authz.maxReservedMinutes=300
+# 0 means no restriction
+vws.group.authz.maxReservedMinutes=0
-# Maximum elapsed (finished) and currently reserved minutes at one point in time
-# If the caller has one other workspace with 600 minutes scheduled and 6000
-# minutes of recorded past usage, the value being checked against this policy
-# would be 6600 minutes plus whatever time the current request is for. This is
-# the all-time maximum usage cap.
-vws.group.authz.maxElapsedReservedMinutes=300
+# 0 means no restriction
+vws.group.authz.maxElapsedReservedMinutes=0
-# Maximum number of CPUs per VM instance
-vws.group.authz.maxCPUs=2
+# 0 means no restriction
+vws.group.authz.maxWorkspaceNumber=0
-# Maximum number of running workspaces at one point in time
-vws.group.authz.maxWorkspaceNumber=5
+# 0 means no restriction
+vws.group.authz.maxWorkspacesInGroup=0
-# Maximum number of workspaces per request
-vws.group.authz.maxWorkspacesInGroup=1
-
-# Image node
-vws.group.authz.imageNodeHostname=example.com
-
-# Image node basedir
-vws.group.authz.imageBaseDirectory=/cloud
-
-# Use DN hashing convention for user-specific subdirectories (see documentation)
-vws.group.authz.dirHashMode=true
View
@@ -177,7 +177,7 @@ echo "========================================="
echo "Making a common user"
echo "========================================="
user_name="nimbus@$RANDOM"
-user_stuff=`$install_dir/bin/nimbus-new-user --group 04 --batch -r cloud_properties,cert,key,access_id,access_secret $user_name`
+user_stuff=`$install_dir/bin/nimbus-new-user --batch -r cloud_properties,cert,key,access_id,access_secret $user_name`
aid=`echo $user_stuff | awk -F , '{ print $4 }'`
apw=`echo $user_stuff | awk -F , '{ print $5 }'`
@@ -189,7 +189,7 @@ echo "Making a new user"
echo "========================================="
user_name="nimbus@$RANDOM"
-user_stuff=`$install_dir/bin/nimbus-new-user --group 04 --batch -r cloud_properties,cert,key,access_id,access_secret,canonical_id $user_name`
+user_stuff=`$install_dir/bin/nimbus-new-user --batch -r cloud_properties,cert,key,access_id,access_secret,canonical_id $user_name`
echo $user_stuff
cp=`echo $user_stuff | awk -F , '{ print $1 }'`

0 comments on commit 93fb60d

Please sign in to comment.