X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/4ce7b0599b235b49c78e3e2b604e5cab21fde98d..cda438488d2b13a4d4ec3bb7002aca6132fb00a0:/master.yaml

diff --git a/master.yaml b/master.yaml
index 8347292..0d8c298 100644
--- a/master.yaml
+++ b/master.yaml
@@ -1,3 +1,6 @@
+apt:
+ keyid: 35AE3C4F
+
 authn:
  - type: kerberos
    realm: ATHENA.MIT.EDU
@@ -6,18 +9,9 @@ authz:
  - type: afs
    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
-   ip: 18.181.0.224
-
-apt:
- keyid: 35AE3C4F
+console:
+ hostname: xvm-console.mit.edu
+ ip: 18.181.0.134
 
 db:
  uri: postgres://invirt@xvm.mit.edu/invirt
@@ -27,9 +21,14 @@ db:
  user: invirt
  dbname: invirt
 
-remote:
- hostname: xvm-remote.mit.edu
- ip: 18.181.0.188
+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
 
 dns:
  contact: xvm@mit.edu
@@ -41,31 +40,23 @@ dns:
  zone_files:
   - /etc/invirt/zone
 
-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
+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
+   ip: 18.181.0.224
 
-web:
- baseuri: https://xvm.mit.edu/
- hostname: xvm.mit.edu
- errormail: xvm@mit.edu
- adminacl: system:xvm-root
- errormail_exclude:
-  - broder
-  - price
-  - ecprice
-  - andersk
-  - quentin
-  - hartmans
+monitoring:
+ - hostname: syn.mit.edu
+   ip: 18.181.0.65
 
-console:
- hostname: xvm-console.mit.edu
- ip: 18.181.0.134
+remote:
+ hostname: xvm-remote.mit.edu
+ ip: 18.181.0.188
 
 svn:
  repopath: /afs/sipb.mit.edu/project/xvm/svn
@@ -78,6 +69,15 @@ vnc:
  base_port: 10003
  proxy_ip: 18.181.0.62
 
-monitoring:
- - hostname: syn.mit.edu
-   ip: 18.181.0.65
+web:
+ baseuri: https://xvm.mit.edu/
+ hostname: xvm.mit.edu
+ errormail: xvm@mit.edu
+ adminacl: system:xvm-root
+ errormail_exclude:
+  - broder
+  - price
+  - ecprice
+  - andersk
+  - quentin
+  - hartmans