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 834)
+++ trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remconffs	(revision 835)
@@ -13,5 +13,5 @@
 from syslog import *
 
-import sipb_xen_database
+from invirt import database
 from invirt.config import structs as config
 
@@ -94,11 +94,11 @@
 		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 getacl(self, machine_name):
 		"""Build the ACL file for a machine
 		"""
-		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)
@@ -229,5 +229,5 @@
 
 if __name__ == '__main__':
-	sipb_xen_database.connect(config.db.uri)
+	database.connect()
 	usage="""
 $0 [mount_path]