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

[invirt/packages/invirt-web.git] / code / templates / unauth.mako

diff --git a/code/templates/unauth.mako b/code/templates/unauth.mako
index ec67c80..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
 

@@ -28,8 +28,7 @@ href="https://${config.web.hostname}/"><strong><font color="green">&rarr;</font>
 href="https://${config.web.hostname}:442/"><strong><font color="green">&rarr;</font> Log in to XVM using Kerberos Tickets</strong>
 </a></big></blockquote>
 
 href="https://${config.web.hostname}:442/"><strong><font color="green">&rarr;</font> Log in to XVM using Kerberos Tickets</strong>
 </a></big></blockquote>
 

-<p>To use MIT certificates you'll need an <a href="http://ca.mit.edu/">MIT personal
-certificate</a>.</p>
+<p>In order to log in, you'll need to obtain <a href="http://ca.mit.edu/">MIT certificates</a></p>

 
 <h2>XVM features:</h2>
 <ul>
 
 <h2>XVM features:</h2>
 <ul>