Index: trunk/packages/sipb-xen-remote-server/config.todo
===================================================================
--- trunk/packages/sipb-xen-remote-server/config.todo	(revision 829)
+++ 	(revision )
@@ -1,4 +1,0 @@
-files/usr/sbin/sipb-xen-remconffs: realm
-files/usr/sbin/sipb-xen-remconffs: db uri
-files/usr/sbin/sipb-xen-remote-proxy: any one host name
-files/usr/sbin/sipb-xen-remctl-help: remote-proxy hostname
Index: trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs	(revision 829)
+++ trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs	(revision 830)
@@ -14,4 +14,5 @@
 
 import sipb_xen_database
+from invirt.config import structs as config
 
 fuse.fuse_python_api = (0, 2)
@@ -121,5 +122,5 @@
 		else:
 			princ = user
-			realm = "ATHENA.MIT.EDU"
+			realm = config.authn[0].realm
 		
 		return princ.replace('.', '/') + '@' + realm
@@ -228,5 +229,5 @@
 
 if __name__ == '__main__':
-	sipb_xen_database.connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+	sipb_xen_database.connect(db.uri)
 	usage="""
 $0 [mount_path]
Index: trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remctl-help
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remctl-help	(revision 829)
+++ trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remctl-help	(revision 830)
@@ -4,5 +4,5 @@
 """
 import sys
-
+from invirt.config import structs as config
 
 help = [
@@ -27,5 +27,5 @@
 def main(args):
     args = [n for n in args if n in helpdict]
-    print 'remctl remote control <machine> <command>'
+    print 'remctl %s control <machine> <command>' % config.remote.hostname
     if args:
         for name in args:
Index: trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy
===================================================================
--- trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy	(revision 829)
+++ trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy	(revision 830)
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 # invoke as sipb-xen-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
 
@@ -23,4 +23,4 @@
 	sipb-xen-remote-control "$MACHINE" "$SERVICE" "$@" ;;
     * )
-	remctl black-mesa remote "$TYPE" "$SERVICE" "$@" ;;
+	remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
 esac