Changeset 2590 for trunk/packages/invirt-web

Timestamp:

Dec 7, 2009, 9:33:43 PM (14 years ago)

Author:

broder

Message:

Store AFS cell configuration at authz.afs.cells instead of just
authz.cells, to be more clear about purpose.

Location:

trunk/packages/invirt-web

Files:

• code/cache_acls.py (modified) (1 diff)
• code/getafsgroups.py (modified) (1 diff)
• code/validation.py (modified) (1 diff)
• invirt-cache-acls (modified) (1 diff)

trunk/packages/invirt-web/code/cache_acls.py

@@ -40 +40 @@
         return []
     try:
-        return getafsgroups.getAfsGroupMembers(name, config.authz.cells[0].cell)
+        return getafsgroups.getAfsGroupMembers(name, config.authz.afs.cells[0].cell)
     except getafsgroups.AfsProcessError:
         return []

trunk/packages/invirt-web/code/getafsgroups.py

@@ -31 +31 @@
 def getAfsGroupMembers(group, cell):
     encrypt = True
-    for c in config.authz.cells:
+    for c in config.authz.afs.cells:
         if c.cell == cell and hasattr(c, 'auth'):
             encrypt = c.auth

trunk/packages/invirt-web/code/validation.py

@@ -223 +223 @@
         admin = 'system:' + admin
     try:
-        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
+        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.afs.cells[0].cell):
             return admin
     except getafsgroups.AfsProcessError, e:

trunk/packages/invirt-web/invirt-cache-acls

@@ -1 +1 @@
 #!/bin/sh
 cells () {
-  for i in $(invirt-getconf -l authz.cells); do
-    invirt-getconf authz.cells.$i.cell
+  for i in $(invirt-getconf -l authz.afs.cells); do
+    invirt-getconf authz.afs.cells.$i.cell
   done
 }