Changeset 834 for trunk

Timestamp:

Aug 3, 2008, 12:46:09 AM (16 years ago)

Author:

y_z

Message:

use invirt config in sipb-xen-lvm and to generate /etc/remctl/acl/remote

Location:

trunk/packages/sipb-xen-remctl-auto

Files:

• config.todo (deleted)
• debian/sipb-xen-remctl-auto.init (copied) (copied from trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.init) (6 diffs)
• files/etc/remctl/acl/remote (deleted)
• files/usr/sbin/sipb-xen-lvm (modified) (2 diffs)

trunk/packages/sipb-xen-remctl-auto/debian/sipb-xen-remctl-auto.init

@@ -1 @@
-#! /bin/sh
+#! /bin/bash
 ### BEGIN INIT INFO
-# Provides:          sipb-xen-console-server
+# Provides:          sipb-xen-remctl-auto
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
@@ -17 +17 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Invirt host console config"
-NAME=sipb-xen-console-server
+NAME=sipb-xen-remctl-auto
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -32 +32 @@
 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
+    echo "host/$(invirt-getconf remote.hostname)@$(invirt-getconf authn.0.realm)" \
+        > /etc/remctl/acl/remote
 }
 
@@ -52 +46 @@
         #   2 if daemon could not be started
         gen_config
-        VERBOSE=no /etc/init.d/conserver-server reload
 }
 
@@ -60 +53 @@
 do_stop()
 {
-        return 1
+        return 0
 }
 
@@ -66 +59 @@
 {
         gen_config
-        VERBOSE=no /etc/init.d/conserver-server reload
 }
 

trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvm

@@ -4 +4 @@
 import os.path
 from subprocess import call, PIPE, Popen
+from invirt.config import structs as config
 
 def check(b):
@@ -22 +23 @@
     from sipb_xen_database import *
     import re
-    connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+    connect(config.db.uri)
     for d in Disk.select():
         check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))