From 8979239273a6a41ef858c4438cbde66e6b75f9dc Mon Sep 17 00:00:00 2001
From: Quentin Smith <quentin@mit.edu>
Date: Thu, 21 Jan 2010 03:06:28 -0500
Subject: [PATCH] Put the MOTD at /etc/invirt/motd.html and parse it as HTML
svn path=/trunk/packages/invirt-web/; revision=2910
---
code/templates/list.mako | 4 ++--
code/templates/unauth.mako | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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
--
1.7.9.5