Index: trunk/packages/invirt-console/debian/changelog
===================================================================
--- trunk/packages/invirt-console/debian/changelog	(revision 3017)
+++ trunk/packages/invirt-console/debian/changelog	(revision 3018)
@@ -2,6 +2,8 @@
 
   * Use the .. Perl operator to simplify the invirt-console-host prerm.
-
- -- Evan Broder <broder@mit.edu>  Thu, 27 May 2010 11:55:53 -0400
+  * Divert /etc/conserver/console.cf on the ocnsole server, since
+    conserver-client also has one of those.
+
+ -- Evan Broder <broder@mit.edu>  Sun, 30 May 2010 11:48:15 -0400
 
 invirt-console (0.2.13) unstable; urgency=low
Index: trunk/packages/invirt-console/debian/rules
===================================================================
--- trunk/packages/invirt-console/debian/rules	(revision 3017)
+++ trunk/packages/invirt-console/debian/rules	(revision 3018)
@@ -24,4 +24,5 @@
 DEB_DIVERT_FILES_invirt-console-host += \
 	/etc/conserver/conserver.cf.invirt \
+	/etc/conserver/console.cf.invirt \
 	/etc/conserver/server.conf.invirt
 
Index: trunk/packages/invirt-console/server/etc/conserver/console.cf
===================================================================
--- trunk/packages/invirt-console/server/etc/conserver/console.cf	(revision 3017)
+++ 	(revision )
@@ -1,5 +1,0 @@
-config * {
-  master localhost;
-  port   3109;
-  sslenabled yes;
-}
Index: trunk/packages/invirt-console/server/etc/conserver/console.cf.invirt
===================================================================
--- trunk/packages/invirt-console/server/etc/conserver/console.cf.invirt	(revision 3018)
+++ trunk/packages/invirt-console/server/etc/conserver/console.cf.invirt	(revision 3018)
@@ -0,0 +1,5 @@
+config * {
+  master localhost;
+  port   3109;
+  sslenabled yes;
+}