Re-arrange the authz configuration.

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

diff --git a/master.yaml b/master.yaml
index 4cbccde..8faa5de 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,9 +1,16 @@
+contact: &contact xvm-dev@mit.edu
+adminacl: system:xvm-dev
+

 kerberos:
  realm: ATHENA.MIT.EDU
 
 authz:
 kerberos:
  realm: ATHENA.MIT.EDU
 
 authz:

- - type: afs
-   cell: athena.mit.edu
+ mech: invirt.authz.locker
+ cells:
+ - cell: athena.mit.edu
+   auth: no
+ - cell: sipb.mit.edu
+   auth: no

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

@@ -28,16 +35,26 @@ 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
+
+dhcp:
+ 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: xvm-dev-auto@mit.edu

 
 xen:
  network:
 
 xen:
  network:

@@ -48,12 +65,9 @@ xen:
 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
 
 vnc:
  base_port: 10003