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

diff --git a/master.yaml b/master.yaml
index f73f80f..cc03b96 100644
--- a/master.yaml
+++ b/master.yaml
@@ -1,3 +1,7 @@
+contact: &contact xvm@mit.edu
+adminacl: system:xvm-root
+priv_contact: &priv_contact xvm-root@mit.edu
+
 apt:
  keyid: 35AE3C4F
 
@@ -31,7 +35,7 @@ dhcp:
  search_domain: mit.edu
 
 dns:
- contact: xvm@mit.edu
+ contact: *contact
  domains: # first one is advertised
   - xvm.mit.edu
   - 2.181.18.in-addr.arpa
@@ -41,6 +45,15 @@ 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
@@ -54,6 +67,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
@@ -76,8 +92,7 @@ vnc:
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu
- errormail: xvm@mit.edu
- adminacl: system:xvm-root
+ errormail: *contact
  errormail_exclude:
   - broder
   - price