Re-arrange the authz configuration.

In particular, even if we allow for mixing of multiple authz
mechanisms at some point, you won't have multiple instances of the
locker authz type, so the "type" shouldn't be a property of each of
the cells we specify how to authenticate against.

svn path=/trunk/packages/xvm-prodconfig/; revision=2557

diff --git a/debian/changelog b/debian/changelog
index 4206b77..d753f5b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xvm-prodconfig (1.1.15) unstable; urgency=low
 
   * Add configuration for the git repositories.
+  * Re-arrange the authz configuration.
 
- -- Evan Broder <broder@mit.edu>  Sun, 11 Oct 2009 18:34:39 -0400
+ -- Evan Broder <broder@mit.edu>  Sun, 22 Nov 2009 20:27:55 -0500
 
 xvm-prodconfig (1.1.14) unstable; urgency=low
 

diff --git a/master.yaml b/master.yaml
index 165b28a..ddf4cd4 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -6,11 +6,11 @@ apt:
  keyid: 35AE3C4F
 
 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
 
 console: