Changeset 841

Timestamp:

Aug 3, 2008, 1:01:49 AM (16 years ago)

Author:

y_z

Message:

• sipb_xen_database -> invirt.database
• use invirt config

Location:

trunk/packages/sipb-xen-console

Files:

• config.todo (modified) (1 diff)
• files/usr/bin/sipb-xen-consolefs (modified) (4 diffs)

trunk/packages/sipb-xen-console/config.todo

@@ -1 @@
-etc/nss-pgsql.conf
-etc/issue.net.no_tkt
-usr/bin/sipb-xen-consolefs: realm
-usr/bin/sipb-xen-consolefs: database
-etc/lots: could benefit from config-package-dev TRANSFORM for upgradeability
+files/etc/nss-pgsql.conf
+files/etc/issue.net.no_tkt
+files/etc/lots: could benefit from config-package-dev TRANSFORM for upgradeability

trunk/packages/sipb-xen-console/files/usr/bin/sipb-xen-consolefs

@@ -13 +13 @@
 from syslog import *
 
-import sipb_xen_database
+from invirt.config import structs as config
+from invirt import database
 
 fuse.fuse_python_api = (0, 2)
@@ -86 +87 @@
                 if time() - self.lasttime > 15:
                         self.lasttime = time()
-                        sipb_xen_database.clear_cache()
-                return [machine.name for machine in sipb_xen_database.Machine.select()]
+                        database.clear_cache()
+                return [machine.name for machine in database.Machine.select()]
         
         def getUid(self, machine_name):
                 """Calculate the UID of a machine-account, which is just machine_id+1000
                 """
-                return sipb_xen_database.Machine.get_by(name=machine_name).machine_id + 1000
+                return database.Machine.get_by(name=machine_name).machine_id + 1000
         
         def getK5login(self, machine_name):
                 """Build the ACL for a machine and turn it into a .k5login file
                 """
-                machine = sipb_xen_database.Machine.get_by(name=machine_name)
+                machine = database.Machine.get_by(name=machine_name)
                 users = [acl.user for acl in machine.acl]
                 return "\n".join(map(self.userToPrinc, users) + [''])
@@ -109 +110 @@
                 else:
                         princ = user
-                        realm = "ATHENA.MIT.EDU"
+                        realm = config.authn[0].realm
                 
                 return princ.replace('.', '/') + '@' + realm
@@ -240 +241 @@
 
 if __name__ == '__main__':
-        sipb_xen_database.connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+        database.connect()
         usage="""
 ConsoleFS [mount_path]