From b8c3fa5712aec5f2076b096969d9bf91631e2b14 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sat, 2 Aug 2008 18:59:44 -0400 Subject: [PATCH] sipb-xen-console-server is totally configurable svn path=/trunk/packages/sipb-xen-console-server/; revision=815 --- config.todo | 2 - debian/changelog | 5 +- debian/sipb-xen-console-server.init | 117 +++++++++++++++++++++++++++++ files/etc/conserver/conserver.cf.sipb-xen | 12 +-- 4 files changed, 122 insertions(+), 14 deletions(-) delete mode 100644 config.todo create mode 100755 debian/sipb-xen-console-server.init diff --git a/config.todo b/config.todo deleted file mode 100644 index 2b1eeb4..0000000 --- a/config.todo +++ /dev/null @@ -1,2 +0,0 @@ -files/etc/conserver/conserver.cf.sipb-xen: console-proxy ip -files/etc/conserver/conserver.cf.sipb-xen: master-vm name diff --git a/debian/changelog b/debian/changelog index b4feddb..760d0e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ sipb-xen-console-server (2.05) unstable; urgency=low * use invirt.config rather than /etc/invirt/* directly * get console-server hostname, db connection string from config + * generate conserver config piece needing console-server ip + * remove console 's_sipb-xen-dev', which doesn't work anyway + * all configured! - -- Greg Price Fri, 1 Aug 2008 23:57:59 -0400 + -- Greg Price Sat, 2 Aug 2008 18:58:59 -0400 sipb-xen-console-server (2.04) unstable; urgency=low diff --git a/debian/sipb-xen-console-server.init b/debian/sipb-xen-console-server.init new file mode 100755 index 0000000..97eac71 --- /dev/null +++ b/debian/sipb-xen-console-server.init @@ -0,0 +1,117 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: sipb-xen-console-server +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: conserver config from invirt config for invirt host +# Description: +### END INIT INFO + +# Author: Invirt/XVM Project, MIT SIPB + +# Do NOT "set -e" + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Invirt host console config" +NAME=sipb-xen-console-server +SCRIPTNAME=/etc/init.d/$NAME + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +gen_config() +{ + console_ip=$(invirt-getconf console.ip) + cat >/etc/conserver/invirt-genconfig.cf <&2 + exit 3 + ;; +esac + +: diff --git a/files/etc/conserver/conserver.cf.sipb-xen b/files/etc/conserver/conserver.cf.sipb-xen index 3177bb7..f86e9fb 100644 --- a/files/etc/conserver/conserver.cf.sipb-xen +++ b/files/etc/conserver/conserver.cf.sipb-xen @@ -10,15 +10,5 @@ default * { execsubst f=cs; } -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/invirt-genconfig.cf #include /etc/conserver/sipb-xen-consoles.cf -- 1.7.9.5