From: Quentin Smith <quentin@mit.edu>
Date: Thu, 21 Jan 2010 08:06:28 +0000 (-0500)
Subject: Put the MOTD at /etc/invirt/motd.html and parse it as HTML
X-Git-Tag: 0.1.5^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/8979239273a6a41ef858c4438cbde66e6b75f9dc?ds=sidebyside

Put the MOTD at /etc/invirt/motd.html and parse it as HTML

svn path=/trunk/packages/invirt-web/; revision=2910
---

diff --git a/code/templates/list.mako b/code/templates/list.mako
index f363537..d71792a 100644
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -9,9 +9,9 @@
 VM List
 </%def>
 
-%if os.path.exists("/etc/invirt/message"):
+%if os.path.exists("/etc/invirt/motd.html"):
 <div class="result">
-<p class="error">${open('/etc/invirt/message').read()}</p>
+<p class="error">${open('/etc/invirt/motd.html').read()|n}</p>
 </div>
 %endif
 
diff --git a/code/templates/unauth.mako b/code/templates/unauth.mako
index f802548..c9739d4 100644
--- a/code/templates/unauth.mako
+++ b/code/templates/unauth.mako
@@ -14,9 +14,9 @@ Debian or Ubuntu install</strong> or install the <strong>operating
 system of your choice</strong>.  The service is <strong>free</strong>
 to any Athena account holder.</p>
 
-%if os.path.exists("/etc/invirt/message"):
+%if os.path.exists("/etc/invirt/motd.html"):
 <div class="result">
-<p class="error">${open('/etc/invirt/message').read()}</p>
+<p class="error">${open('/etc/invirt/motd.html').read()|n}</p>
 </div>
 %endif