Clean up stray conflict markers.

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

diff --git a/master.yaml b/master.yaml
index c45f2c3..8347292 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -54,7 +54,7 @@ web:
  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
@@ -72,8 +72,12 @@ svn:
  uri: https://xvm.mit.edu:1111
 
 trac:
- uri: https://xvm.mit.edu/trac/wiki
+ uri: https://xvm.scripts.mit.edu
 
 vnc:
  base_port: 10003
  proxy_ip: 18.181.0.62
+
+monitoring:
+ - hostname: syn.mit.edu
+   ip: 18.181.0.65