Change the webacl to xvm-root

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

diff --git a/master.yaml b/master.yaml
index 6337b74..d68566d 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -7,6 +7,10 @@ authz:
    cell: athena.mit.edu
 
 hosts: # hosts on which VMs run
+ - hostname: citadel-station.mit.edu
+   ip: 18.181.0.221
+ - hostname: aperture-science.mit.edu
+   ip: 18.181.0.222
  - hostname: shadow-moses.mit.edu
    ip: 18.181.0.223
  - hostname: arklay-mansion.mit.edu
@@ -16,24 +20,26 @@ apt:
  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:
- 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
-  - prod.xvm.mit.edu
+  - xvm.mit.edu
  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
 
 dhcp:
  gateway: 18.181.0.1
@@ -45,27 +51,29 @@ dhcp:
  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
- adminacl: system:xvm-webacl
+ adminacl: system:xvm-root
  errormail_exclude:
-  - '*'
+  - broder
   - price
   - ecprice
   - andersk
+  - quentin
+  - hartmans
 
 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
- 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
- proxy_ip: 18.181.0.80
+ proxy_ip: 18.181.0.62