Are we xvm now? Really? Make it so

svn path=/trunk/packages/sipb-xen-www/; revision=543

diff --git a/code/controls.py b/code/controls.py
index 68e911c..841d21b 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -119,7 +119,7 @@ def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone
         open_nics = NIC.select_by(machine_id=None)
         if not open_nics: #No IPs left!
             raise CodeError("No IP addresses left!  "
-                            "Contact sipb-xen@mit.edu.")
+                            "Contact xvm@mit.edu.")
         nic = open_nics[0]
         nic.machine_id = machine.machine_id
         nic.hostname = name

diff --git a/code/static/about.html b/code/static/about.html
index 77c8eda..d99d819 100644 (file)
--- a/code/static/about.html
+++ b/code/static/about.html
@@ -27,6 +27,6 @@ Lots of services claim to be beta when they're really almost release-worthy. SIP
 <p>If you're OK with this, we hope you enjoy using and helping us test <a href="/">SIPB Virtual Servers</a>.</p>
 
 <hr />
-Questions? Contact <a href="mailto:sipb-xen@mit.edu">sipb-xen@mit.edu</a>.
+Questions? Contact <a href="mailto:xvm@mit.edu">xvm@mit.edu</a>.
 </body>
 </html>

diff --git a/code/templates/error.tmpl b/code/templates/error.tmpl
index 678d36f..b129599 100644 (file)
--- a/code/templates/error.tmpl
+++ b/code/templates/error.tmpl
@@ -7,6 +7,6 @@ ERROR!
 
 #def body
 <p>$errorMessage in operation $op.  This shouldn't happen!  Please
-email sipb-xen@mit.edu to explain how it happened.  Stderr:</p>
+email xvm@mit.edu to explain how it happened.  Stderr:</p>
 <pre>$stderr</pre>
 #end def

diff --git a/code/templates/skeleton.tmpl b/code/templates/skeleton.tmpl
index d7855fb..a83d42d 100644 (file)
--- a/code/templates/skeleton.tmpl
+++ b/code/templates/skeleton.tmpl
@@ -73,7 +73,7 @@ $body
 #end filter
 #if not $varExists('simple') or not $simple
 <hr />
-Questions? Contact <a href="mailto:sipb-xen@mit.edu">sipb-xen@mit.edu</a>.
+Questions? Contact <a href="mailto:xvm@mit.edu">xvm@mit.edu</a>.
 #end if
 </body>
 </html>