Add a mail.contact entry in xvm-devconfig and xvm-prodconfig for who

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

diff --git a/master.yaml b/master.yaml
index bfddb34..d047bc9 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,13 +1,22 @@
+contact: &contact xvm@mit.edu
+adminacl: system:xvm-dev
+

 kerberos:
  realm: ATHENA.MIT.EDU
 
 authz:
  - type: afs
    cell: athena.mit.edu
 kerberos:
  realm: ATHENA.MIT.EDU
 
 authz:
  - type: afs
    cell: athena.mit.edu

+   auth: no
+ - type: afs
+   cell: sipb.mit.edu
+   auth: no

 
 hosts: # hosts on which VMs run
  - hostname: black-mesa.mit.edu
    ip: 18.181.0.60
 
 hosts: # hosts on which VMs run
  - hostname: black-mesa.mit.edu
    ip: 18.181.0.60

+ - hostname: torchwood-institute.mit.edu
+   ip: 18.181.0.165

 
 db:
  uri: postgres://invirt@xvm-dev.mit.edu/invirt
 
 db:
  uri: postgres://invirt@xvm-dev.mit.edu/invirt

@@ -26,27 +35,43 @@ remote:
  ip: 18.181.0.231
 
 dns:
  ip: 18.181.0.231
 
 dns:

- contact: xvm@mit.edu
+ contact: *contact

  domains:  # first one is advertised
   - dev.xvm.mit.edu
  domains:  # first one is advertised
   - dev.xvm.mit.edu

+  - 2.181.18.in-addr.arpa
+  - 1.181.18.in-addr.arpa

  nameservers:
   - hostname: xvm-dev.mit.edu
     ip: 18.181.0.80
  nameservers:
   - hostname: xvm-dev.mit.edu
     ip: 18.181.0.80

- rootip: 18.181.0.80
- passup:
-  - _vlmcs._tcp
- parent: mit.edu

 
 

-network:
+dhcp:

  gateway: 18.181.0.1
  netmask: 255.255.0.0
  gateway: 18.181.0.1
  netmask: 255.255.0.0

+ dns:
+  - 18.70.0.160
+  - 18.71.0.151
+  - 18.72.0.3
+ search_domain: mit.edu
+
+mail:
+ forward: *contact
+
+xen:
+ network:
+  gateway: 18.181.0.1
+  netmask: 255.255.0.0
+  iface: eth0

 
 web:
  baseuri: https://xvm-dev.mit.edu/
  hostname: xvm-dev.mit.edu
 
 web:
  baseuri: https://xvm-dev.mit.edu/
  hostname: xvm-dev.mit.edu

- errormail: xvm@mit.edu
- adminacl: system:xvm
+ errormail: *contact

  errormail_exclude:
  errormail_exclude:

-  - price
-  - ecprice
-  - andersk
+  - '*'
+
+vnc:
+ base_port: 10003
+ proxy_ip: 18.181.0.80
+
+trac:
+ uri: https://xvm.scripts.mit.edu