Index: trunk/packages/xvm-prodconfig/debian/changelog
===================================================================
--- trunk/packages/xvm-prodconfig/debian/changelog	(revision 1832)
+++ trunk/packages/xvm-prodconfig/debian/changelog	(revision 1834)
@@ -1,2 +1,9 @@
+xvm-prodconfig (1.1.3) unstable; urgency=low
+
+  * Alphabetize the sections of master.yaml so they make a little more
+    sense
+
+ -- Evan Broder <broder@mit.edu>  Wed, 10 Dec 2008 21:48:11 -0500
+
 xvm-prodconfig (1.1.2) unstable; urgency=low
 
Index: trunk/packages/xvm-prodconfig/master.yaml
===================================================================
--- trunk/packages/xvm-prodconfig/master.yaml	(revision 1832)
+++ trunk/packages/xvm-prodconfig/master.yaml	(revision 1834)
@@ -1,2 +1,5 @@
+apt:
+ keyid: 35AE3C4F
+
 authn:
  - type: kerberos
@@ -6,4 +9,35 @@
  - type: afs
    cell: athena.mit.edu
+
+console:
+ hostname: xvm-console.mit.edu
+ ip: 18.181.0.134
+
+db:
+ uri: postgres://invirt@xvm.mit.edu/invirt
+ host: xvm.mit.edu
+ ip: 18.181.0.62
+ port: 5432
+ user: invirt
+ dbname: invirt
+
+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
+ domains: # first one is advertised
+  - xvm.mit.edu
+ nameservers:
+  - hostname: xvm.mit.edu
+    ip: 18.181.0.62
+ zone_files:
+  - /etc/invirt/zone
 
 hosts: # hosts on which VMs run
@@ -17,14 +51,7 @@
    ip: 18.181.0.224
 
-apt:
- keyid: 35AE3C4F
-
-db:
- uri: postgres://invirt@xvm.mit.edu/invirt
- host: xvm.mit.edu
- ip: 18.181.0.62
- port: 5432
- user: invirt
- dbname: invirt
+monitoring:
+ - hostname: syn.mit.edu
+   ip: 18.181.0.65
 
 remote:
@@ -32,22 +59,14 @@
  ip: 18.181.0.188
 
-dns:
- contact: xvm@mit.edu
- domains: # first one is advertised
-  - xvm.mit.edu
- nameservers:
-  - hostname: xvm.mit.edu
-    ip: 18.181.0.62
- zone_files:
-  - /etc/invirt/zone
+svn:
+ repopath: /afs/sipb.mit.edu/project/xvm/svn
+ uri: https://xvm.mit.edu:1111
 
-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
+trac:
+ uri: https://xvm.scripts.mit.edu
+
+vnc:
+ base_port: 10003
+ proxy_ip: 18.181.0.62
 
 web:
@@ -63,21 +82,2 @@
   - quentin
   - hartmans
-
-console:
- hostname: xvm-console.mit.edu
- ip: 18.181.0.134
-
-svn:
- repopath: /afs/sipb.mit.edu/project/xvm/svn
- uri: https://xvm.mit.edu:1111
-
-trac:
- 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