configurize some web code

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

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 81827b0..130f359 100644 (file)
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from sipb_xen_database import *
+from invirt.database import *
 import sys
 import getafsgroups
 import subprocess
@@ -27,8 +27,11 @@ def expandName(name):
     if ':' not in name:
         if isUser(name):
             return [name]
-        name = 'system:'+name
-    return getafsgroups.getAfsGroupMembers(name, 'athena.mit.edu')
+        return []
+    try:
+        return getafsgroups.getAfsGroupMembers(name, 'athena.mit.edu')
+    except getafsgroups.AfsProcessError:
+        return []
 
 def accessList(m):
     people = set()
@@ -43,7 +46,8 @@ def refreshMachine(m):
         ma = [x for x in m.acl if x.user == removed][0]
         ctx.current.delete(ma)
     for p in people - old_people:
-        ma = MachineAccess(machine_id=m.machine_id, user=p)
+        ma = MachineAccess(user=p)
+        m.acl.append(ma)
         ctx.current.save(ma)
     
 def refreshCache():
@@ -63,5 +67,5 @@ def refreshCache():
         raise
 
 if __name__ == '__main__':
-    connect('postgres://sipb-xen@sipb-xen-dev/sipb_xen')
+    connect()
     refreshCache()