From 8b723d5c2cad29205e1f48142a9f5d4350c9fd2a Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Sat, 20 Apr 2013 20:42:38 -0400 Subject: [PATCH] fix remconffs --- debian/changelog | 6 ++++++ server/usr/sbin/invirt-remconffs | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f45b7f..bea078e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ invirt-remote (0.4.16) unstable; urgency=low -- Peter A. Iannucci Tue, 28 May 2013 20:19:00 -0400 +invirt-remote (0.4.15~glasgall6) precise; urgency=low + + * Fix remconffs so stat() doesn't make things explode + + -- Adam Glasgall Sat, 20 Apr 2013 20:42:02 -0400 + invirt-remote (0.4.15~glasgall5) precise; urgency=low * Fix sqlalchemy API changes _properly_. diff --git a/server/usr/sbin/invirt-remconffs b/server/usr/sbin/invirt-remconffs index 5bcd4e3..17ec450 100755 --- a/server/usr/sbin/invirt-remconffs +++ b/server/usr/sbin/invirt-remconffs @@ -57,17 +57,17 @@ class RemConfFS(routefs.RouteFS): from_obj=[database.machine_access_table, database.machine_table]) # from tables users = [self.userToPrinc(acl[0]) for acl in database.session.execute(s)] - return "\n".join(users - + ['include /etc/remctl/acl/web', - '']) + return routefs.File("\n".join(users + + ['include /etc/remctl/acl/web', + ''])) def getconf(self, **kw): """Build the master conf file, with all machines """ - return '\n'.join("control %s /usr/sbin/invirt-remote-proxy-control" - " /etc/remctl/remconffs/acl/%s" - % (machine_name, machine_name) - for machine_name in self.getmachines())+'\n' + return routefs.File('\n'.join("control %s /usr/sbin/invirt-remote-proxy-control" + " /etc/remctl/remconffs/acl/%s" + % (machine_name, machine_name) + for machine_name in self.getmachines())+'\n') def getmachines(self, **kw): """Get the list of VMs in the database. Does not cache to prevent race conditions.""" @@ -79,7 +79,7 @@ class RemConfFS(routefs.RouteFS): """ acl = [self.userToPrinc(row[0]) for row in database.session.execute(sa.sql.select([database.admins_table.c.user]))] acl.append('include /etc/remctl/acl/web\n') - return '\n'.join(acl) + return routefs.File('\n'.join(acl)) def userToPrinc(self, user): """Convert Kerberos v4-style names to v5-style and append a default -- 1.7.9.5