X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/blobdiff_plain/d6f712f8a60a836f5d959db9df51feaf3fd28e22..7f53b6cbcf5195b38271e6bff3a4a8fcbf3e9edb:/files/etc/conserver/conserver.cf.sipb-xen?ds=sidebyside

diff --git a/files/etc/conserver/conserver.cf.sipb-xen b/files/etc/conserver/conserver.cf.sipb-xen
index 094685a..a1f6403 100644
--- a/files/etc/conserver/conserver.cf.sipb-xen
+++ b/files/etc/conserver/conserver.cf.sipb-xen
@@ -1,36 +1,25 @@
-# The character '&' in logfile names are substituted with the console
-# name.
-#
-
 config * {
 	sslrequired yes;
 }
-default full {
-	rw *;
+
+# If no consoles are defined, as is the case when the host first boots
+# up, conserver will quit. This keeps it running.
+#
+# Should someone create a VM called dummy-console, their VM will
+# shadow over this one.
+console dummy-console {
+        master localhost;
+        type noop;
 }
+
 default * {
-	master black-mesa;
 	logfile /var/log/conserver/&.log;
 	timestamp "1lab";
-	include full;
+	rw *;
 	type exec;
-	exec xm console d_f;
+	exec sudo xm console d_f;
 	execsubst f=cs;
 }
 
-console s_sipb-xen-dev {
-	type exec;
-	exec xm console s_sipb-xen-dev;
-}
-
-#include /etc/conserver/includes.cf
-
-##
-## list of clients we allow
-##
-access * {
-	allowed 127.0.0.1;
-	trusted 18.181.0.134;
-	limited *;
-}
-
+#include /etc/conserver/invirt-genconfig.cf
+#include /etc/conserver/sipb-xen-consoles.cf