Change the webacl to xvm-root

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

diff --git a/master.yaml b/master.yaml
index 2114b4e..d68566d 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -20,24 +20,24 @@ apt:
  keyid: 35AE3C4F
 
 db:
  keyid: 35AE3C4F
 
 db:

- uri: postgres://invirt@xvm-dev.mit.edu/invirt
- host: xvm-dev.mit.edu
- ip: 18.181.0.80
+ uri: postgres://invirt@xvm.mit.edu/invirt
+ host: xvm.mit.edu
+ ip: 18.181.0.62

  port: 5432
  user: invirt
  dbname: invirt
 
 remote:
  port: 5432
  user: invirt
  dbname: invirt
 
 remote:

- hostname: xvm-remote-dev.mit.edu
- ip: 18.181.0.231
+ hostname: xvm-remote.mit.edu
+ ip: 18.181.0.188

 
 dns:
  contact: xvm@mit.edu
  domains: # first one is advertised
 
 dns:
  contact: xvm@mit.edu
  domains: # first one is advertised

-  - prod.xvm.mit.edu
+  - xvm.mit.edu

  nameservers:
  nameservers:

-  - hostname: xvm-dev.mit.edu
-    ip: 18.181.0.80
+  - hostname: xvm.mit.edu
+    ip: 18.181.0.62

  zone_files:
   - /etc/invirt/zone
 
  zone_files:
   - /etc/invirt/zone
 

@@ -51,27 +51,29 @@ dhcp:
  search_domain: mit.edu
 
 web:
  search_domain: mit.edu
 
 web:

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

  errormail: xvm@mit.edu
  errormail: xvm@mit.edu

- adminacl: system:xvm-webacl
+ adminacl: system:xvm-root

  errormail_exclude:
  errormail_exclude:

-  - '*'
+  - broder

   - price
   - ecprice
   - andersk
   - price
   - ecprice
   - andersk

+  - quentin
+  - hartmans

 
 console:
 
 console:

- hostname: xvm-console-dev.mit.edu
- ip: 18.181.0.230
+ hostname: xvm-console.mit.edu
+ ip: 18.181.0.134

 
 svn:
  repopath: /afs/sipb.mit.edu/project/xvm/svn
 
 svn:
  repopath: /afs/sipb.mit.edu/project/xvm/svn

- uri: https://xvm-dev.mit.edu:1111
+ uri: https://xvm.mit.edu:1111

 
 trac:
  uri: https://xvm.mit.edu/trac/wiki
 
 vnc:
  base_port: 10003
 
 trac:
  uri: https://xvm.mit.edu/trac/wiki
 
 vnc:
  base_port: 10003

- proxy_ip: 18.181.0.80
+ proxy_ip: 18.181.0.62