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 (file)
--- 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;
 }
 config * {
        sslrequired yes;
 }

-default full {
-       rw *;
-}

 default * {
        logfile /var/log/conserver/&.log;
        timestamp "1lab";
 default * {
        logfile /var/log/conserver/&.log;
        timestamp "1lab";

-       include full;
+       rw *;

        type exec;
        exec xm console d_f;
        execsubst f=cs;
 }
 
        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 *;
 }
 
 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