sipb-xen-console-server is totally configurable

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

diff --git a/config.todo b/config.todo
deleted file mode 100644 (file)
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 (file)
--- 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 <price@mit.edu>  Fri,  1 Aug 2008 23:57:59 -0400
+ -- Greg Price <price@mit.edu>  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 (executable)
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 <invirt@mit.edu>
+
+# 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 <<EOF
+access * {
+       trusted 127.0.0.1;
+       trusted $console_ip;
+       limited *;
+}
+EOF
+}
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+       # Return
+       #   0 if daemon has been started
+       #   1 if daemon was already running
+       #   2 if daemon could not be started
+       gen_config
+       VERBOSE=no /etc/init.d/conserver-server reload
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+       return 1
+}
+
+do_reload()
+{
+       gen_config
+       VERBOSE=no /etc/init.d/conserver-server reload
+}
+
+case "$1" in
+  start)
+       [ "$VERBOSE" != no ] && log_begin_msg "Starting $DESC" "$NAME"
+       do_start
+       case "$?" in
+               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+       esac
+       ;;
+  stop)
+       [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+       do_stop
+       case "$?" in
+               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+       esac
+       ;;
+  reload|force-reload)
+       log_daemon_msg "Reloading $DESC" "$NAME"
+       do_reload
+       log_end_msg $?
+       ;;
+  restart)
+       log_daemon_msg "Restarting $DESC" "$NAME"
+       do_stop
+       case "$?" in
+         0|1)
+               do_start
+               case "$?" in
+                       0) log_end_msg 0 ;;
+                       1) log_end_msg 1 ;; # Old process is still running
+                       *) log_end_msg 1 ;; # Failed to start
+               esac
+               ;;
+         *)
+               # Failed to stop
+               log_end_msg 1
+               ;;
+       esac
+       ;;
+  *)
+       echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&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 (file)
--- 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