From: Greg Price <price@mit.edu>
Date: Tue, 22 Jul 2008 05:29:06 +0000 (-0400)
Subject: simplify host's conserver.cf
X-Git-Tag: sipb-xen-console-server/2.04~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/d9b916e6e51e0ec8e885545e24ca525d7b1cec60

simplify host's conserver.cf

svn path=/trunk/packages/sipb-xen-console-server/; revision=708
---

diff --git a/files/etc/conserver/conserver.cf.sipb-xen b/files/etc/conserver/conserver.cf.sipb-xen
index 097e010..3177bb7 100644
--- a/files/etc/conserver/conserver.cf.sipb-xen
+++ b/files/etc/conserver/conserver.cf.sipb-xen
@@ -1,35 +1,24 @@
-# The character '&' in logfile names are substituted with the console
-# name.
-#
-
 config * {
 	sslrequired yes;
 }
-default full {
-	rw *;
-}
 default * {
 	logfile /var/log/conserver/&.log;
 	timestamp "1lab";
-	include full;
+	rw *;
 	type exec;
 	exec xm console d_f;
 	execsubst f=cs;
 }
 
-console s_sipb-xen-dev {
-	type exec;
-	exec xm console s_sipb-xen-dev;
-}
-
-#include /etc/conserver/sipb-xen-consoles.cf
-
-##
-## list of clients we allow
-##
 access * {
 	trusted 127.0.0.1;
 	trusted 18.181.0.134;
 	limited *;
 }
 
+console s_sipb-xen-dev {
+	type exec;
+	exec xm console s_sipb-xen-dev;
+}
+
+#include /etc/conserver/sipb-xen-consoles.cf