using mako-render instead of mako; fixed a typo in svn.mako

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

diff --git a/code/main.py b/code/main.py
index 42a456e..78ca14f 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.")
         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,
         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)
     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,
                help=helpHandler,
                unauth=unauthFront,
                admin=admin,

+               overlord=admin,

                errortest=throwError)
 
 def printHeaders(headers):
                errortest=throwError)
 
 def printHeaders(headers):

@@ -648,7 +649,7 @@ def show_error(op, username, fields, err, emsg, traceback):
     d = dict(op=op, user=username, fields=fields,
              errorMessage=str(err), stderr=emsg, traceback=traceback)
     details = templates.error_raw(searchList=[d])
     d = dict(op=op, user=username, fields=fields,
              errorMessage=str(err), stderr=emsg, traceback=traceback)
     details = templates.error_raw(searchList=[d])

-    if username not in ('price', 'ecprice', 'andersk'): #add yourself at will
+    if username not in config.web.errormail_exclude:

         send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
                         details)
     d['details'] = details
         send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
                         details)
     d['details'] = details