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 (file)
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -9,9 +9,9 @@
 VM List
 </%def>
 
 VM List
 </%def>
 

-%if os.path.exists("/etc/invirt/message"):
+%if os.path.exists("/etc/invirt/motd.html"):

 <div class="result">
 <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
 
 </div>
 %endif
 

diff --git a/code/templates/unauth.mako b/code/templates/unauth.mako
index f802548..c9739d4 100644 (file)
--- 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>
 
 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">
 <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
 
 </div>
 %endif