add and respect 'adminable' column to machines

[invirt/packages/invirt-web.git] / code / main.py

diff --git a/code/main.py b/code/main.py
index 42a456e..f6f0bff 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -600,9 +600,9 @@ def admin(username, state, path, fields):
         return ({'Status': '303 See Other',
                  'Location': 'admin/'},
                 "You shouldn't see this message.")
-    if not username in getAfsGroupMembers('system:xvm', 'athena.mit.edu'):
+    if not username in getAfsGroupMembers(config.web.adminacl, 'athena.mit.edu'):
         raise InvalidInput('username', username,
-                           'Not in admin group %s.' % 'system:xvm')
+                           'Not in admin group %s.' % config.web.adminacl)
     newstate = State(username, isadmin=True)
     newstate.environ = state.environ
     return handler(username, newstate, path, fields)
@@ -620,6 +620,7 @@ mapping = dict(list=listVms,
                help=helpHandler,
                unauth=unauthFront,
                admin=admin,
+               overlord=admin,
                errortest=throwError)
 
 def printHeaders(headers):