Index: trunk/packages/invirt-database/python/database/validate.py
===================================================================
--- trunk/packages/invirt-database/python/database/validate.py	(revision 2556)
+++ trunk/packages/invirt-database/python/database/validate.py	(revision 2557)
@@ -241,5 +241,5 @@
         admin = 'system:' + admin
     try:
-        if user in getafsgroups.getAfsGroupMembers(admin, config.authz[0].cell):
+        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
             return admin
     except getafsgroups.AfsProcessError, e:
Index: trunk/packages/invirt-web/code/cache_acls.py
===================================================================
--- trunk/packages/invirt-web/code/cache_acls.py	(revision 2556)
+++ trunk/packages/invirt-web/code/cache_acls.py	(revision 2557)
@@ -40,5 +40,5 @@
         return []
     try:
-        return getafsgroups.getAfsGroupMembers(name, config.authz[0].cell)
+        return getafsgroups.getAfsGroupMembers(name, config.authz.cells[0].cell)
     except getafsgroups.AfsProcessError:
         return []
Index: trunk/packages/invirt-web/code/getafsgroups.py
===================================================================
--- trunk/packages/invirt-web/code/getafsgroups.py	(revision 2556)
+++ trunk/packages/invirt-web/code/getafsgroups.py	(revision 2557)
@@ -31,6 +31,6 @@
 def getAfsGroupMembers(group, cell):
     encrypt = True
-    for c in config.authz:
-        if c.type == 'afs' and c.cell == cell and hasattr(c, 'auth'):
+    for c in config.authz.cells:
+        if c.cell == cell and hasattr(c, 'auth'):
             encrypt = c.auth
     subprocess.check_call(['aklog', cell], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
Index: trunk/packages/invirt-web/code/validation.py
===================================================================
--- trunk/packages/invirt-web/code/validation.py	(revision 2556)
+++ trunk/packages/invirt-web/code/validation.py	(revision 2557)
@@ -223,5 +223,5 @@
         admin = 'system:' + admin
     try:
-        if user in getafsgroups.getAfsGroupMembers(admin, config.authz[0].cell):
+        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
             return admin
     except getafsgroups.AfsProcessError, e:
Index: trunk/packages/invirt-web/invirt-cache-acls
===================================================================
--- trunk/packages/invirt-web/invirt-cache-acls	(revision 2556)
+++ trunk/packages/invirt-web/invirt-cache-acls	(revision 2557)
@@ -1,8 +1,6 @@
 #!/bin/sh
 cells () {
-  for i in $(invirt-getconf -l authz); do
-    if [ afs = "$(invirt-getconf authz.$i.type)" ]; then
-      invirt-getconf authz.$i.cell
-    fi
+  for i in $(invirt-getconf -l authz.cells); do
+    invirt-getconf authz.cells.$i.cell
   done
 }
Index: trunk/packages/xvm-devconfig/master.yaml
===================================================================
--- trunk/packages/xvm-devconfig/master.yaml	(revision 2556)
+++ trunk/packages/xvm-devconfig/master.yaml	(revision 2557)
@@ -6,9 +6,9 @@
 
 authz:
- - type: afs
-   cell: athena.mit.edu
+ mech: invirt.authz.locker
+ cells:
+ - cell: athena.mit.edu
    auth: no
- - type: afs
-   cell: sipb.mit.edu
+ - cell: sipb.mit.edu
    auth: no
 
Index: trunk/packages/xvm-prodconfig/debian/changelog
===================================================================
--- trunk/packages/xvm-prodconfig/debian/changelog	(revision 2556)
+++ trunk/packages/xvm-prodconfig/debian/changelog	(revision 2557)
@@ -2,6 +2,7 @@
 
   * Add configuration for the git repositories.
-
- -- Evan Broder <broder@mit.edu>  Sun, 11 Oct 2009 18:34:39 -0400
+  * Re-arrange the authz configuration.
+
+ -- Evan Broder <broder@mit.edu>  Sun, 22 Nov 2009 20:27:55 -0500
 
 xvm-prodconfig (1.1.14) unstable; urgency=low
Index: trunk/packages/xvm-prodconfig/master.yaml
===================================================================
--- trunk/packages/xvm-prodconfig/master.yaml	(revision 2556)
+++ trunk/packages/xvm-prodconfig/master.yaml	(revision 2557)
@@ -7,9 +7,9 @@
 
 authz:
- - type: afs
-   cell: athena.mit.edu
+ mech: invirt.authz.locker
+ cells:
+ - cell: athena.mit.edu
    auth: yes
- - type: afs
-   cell: sipb.mit.edu
+ - cell: sipb.mit.edu
    auth: yes