Merge invirt-console-server into invirt-console (LP: #305681)

[invirt/packages/invirt-console.git] / host / etc / conserver / gitweb.css

diff --git a/files/etc/conserver/conserver.cf.invirt b/files/etc/conserver/conserver.cf.invirt
deleted file mode 100644 (file)
index 1b92380..0000000
--- a/files/etc/conserver/conserver.cf.invirt
+++ /dev/null
@@ -1,25 +0,0 @@
-config * {
-       sslrequired yes;
-}
-
-# 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 * {
-       logfile /var/log/conserver/&.log;
-       timestamp "1lab";
-       rw *;
-       type exec;
-       exec sudo xm console d_f;
-       execsubst f=cs;
-}
-
-#include /etc/conserver/invirt-genconfig.cf
-#include /etc/conserver/invirt-consoles.cf