Changeset 830

Timestamp:

Aug 3, 2008, 12:32:21 AM (16 years ago)

Author:

y_z

Message:

use invirt config

Location:

trunk/packages/sipb-xen-remote-server

Files:

• config.todo (deleted)
• files/usr/sbin/sipb-xen-remconffs (modified) (3 diffs)
• files/usr/sbin/sipb-xen-remctl-help (modified) (2 diffs)
• files/usr/sbin/sipb-xen-remote-proxy (modified) (2 diffs)

trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs

@@ -14 +14 @@
 
 import sipb_xen_database
+from invirt.config import structs as config
 
 fuse.fuse_python_api = (0, 2)
@@ -121 +122 @@
                 else:
                         princ = user
-                        realm = "ATHENA.MIT.EDU"
+                        realm = config.authn[0].realm
                 
                 return princ.replace('.', '/') + '@' + realm
@@ -228 +229 @@
 
 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]

trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remctl-help

@@ -4 +4 @@
 """
 import sys
-
+from invirt.config import structs as config
 
 help = [
@@ -27 +27 @@
 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:

trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # invoke as sipb-xen-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
 
@@ -23 +23 @@
         sipb-xen-remote-control "$MACHINE" "$SERVICE" "$@" ;;
     * )
-        remctl black-mesa remote "$TYPE" "$SERVICE" "$@" ;;
+        remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
 esac