X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/3baf05bcc8d1bafe85af456578487de16f1e9af5..68ed9892dddc8a78b725af3eda199c81607f0cb2:/master.yaml

diff --git a/master.yaml b/master.yaml
index cc03b96..b4de061 100644
--- a/master.yaml
+++ b/master.yaml
@@ -1,17 +1,39 @@
 contact: &contact xvm@mit.edu
-adminacl: system:xvm-root
+adminacl: &adminacl system:xvm-root
 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:
  keyid: 35AE3C4F
 
 authz:
- - type: afs
-   cell: athena.mit.edu
-   auth: yes
- - type: afs
-   cell: sipb.mit.edu
-   auth: yes
+ mech: invirt.authz.locker
+ afs:
+  cells:
+  - cell: athena.mit.edu
+    auth: yes
+  - cell: sipb.mit.edu
+    auth: yes
+  - cell: zone.mit.edu
+    auth: yes
+  - cell: ops.mit.edu
+    auth: no
+  - cell: net.mit.edu
+    auth: no
+  - cell: dev.mit.edu
+    auth: no
+
+build:
+ pockets:
+  prod:
+   acl: *adminacl
+   apt: stable
+  dev:
+   acl: system:xvm-dev
+   apt: unstable
+   allow_backtracking: yes
+ tagger:
+  name: Invirt Build Server
+  email: invirt@mit.edu
 
 console:
  hostname: xvm-console.mit.edu
@@ -45,15 +67,6 @@ dns:
  zone_files:
   - /etc/invirt/zone
 
-git:
- branches:
-  prod:
-   acl: *adminacl
-   component: stable
-  dev:
-   acl: system:xvm-dev
-   component: unstable
-
 hosts: # hosts on which VMs run
  - hostname: citadel-station.mit.edu
    ip: 18.181.0.221