Rearrange the git configuration slightly:

[invirt/packages/xvm-prodconfig.git] / master.yaml

diff --git a/master.yaml b/master.yaml
index 9a1d59a..165b28a 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,5 +1,6 @@
 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
@@ -44,6 +45,19 @@ dns:
  zone_files:
   - /etc/invirt/zone
 
+git:
+ 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
+
 hosts: # hosts on which VMs run
  - hostname: citadel-station.mit.edu
    ip: 18.181.0.221
@@ -57,6 +71,9 @@ hosts: # hosts on which VMs run
 kerberos:
  realm: ATHENA.MIT.EDU
 
+mail:
+ forward: *priv_contact
+
 monitoring:
  - hostname: syn.mit.edu
    ip: 18.181.0.65