Merged in cp fixes

diff --git a/code/templates/error.mako b/code/templates/error.mako
index 1edb1b4..77c357b 100644 (file)
--- a/code/templates/error.mako
+++ b/code/templates/error.mako
@@ -5,6 +5,12 @@
 ERROR!
 </%def>
 
+%if os.path.exists("/etc/invirt/motd.html"):
+<div class="result">
+<p class="error">${open('/etc/invirt/motd.html').read()|n}</p>
+</div>
+%endif
+
 <p>Uh-oh!  We experienced an error.  Sorry about that.  We've gotten
 mail about it.</p>
 

diff --git a/code/templates/info.mako b/code/templates/info.mako
index e83fef1..1fb4284 100644 (file)
--- a/code/templates/info.mako
+++ b/code/templates/info.mako
@@ -5,6 +5,12 @@
 Info on ${machine.name}
 </%def>
 
+%if os.path.exists("/etc/invirt/motd.html"):
+<div class="result">
+<p class="error">${open('/etc/invirt/motd.html').read()|n}</p>
+</div>
+%endif
+
 <%def name="infoTable()">
 <h2>Info</h2>
 <table>

diff --git a/debian/changelog b/debian/changelog
index 43fd021..60de897 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
+invirt-web (0.1.36) unstable; urgency=low
+
+  * Punched version.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 23:32:57 -0400
+
+invirt-web (0.1.35) unstable; urgency=low
+
+  * Added motd to error page and VM info page.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 23:31:50 -0400
+
 invirt-web (0.1.34) precise; urgency=low
 
   * Use config-package-dev.
 
  -- Alexander Chernyakhovsky <achernya@mit.edu>  Sun, 21 Jul 2013 12:42:40 -0400
+>>>>>>> d7b8e92
 
 invirt-web (0.1.33) precise; urgency=low