From ab926a56b79039d0c86cc2bd3f5a2faf7bbbfd43 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sat, 15 Nov 2008 18:13:11 -0500 Subject: [PATCH] merge about.html's remaining caveats into unauth front page svn path=/trunk/packages/invirt-web/; revision=1661 --- code/static/about.html | 24 ------------------------ code/templates/list.tmpl | 3 ++- code/templates/unauth.tmpl | 9 +++++++++ config.todo | 2 -- 4 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 code/static/about.html diff --git a/code/static/about.html b/code/static/about.html deleted file mode 100644 index a40c6d1..0000000 --- a/code/static/about.html +++ /dev/null @@ -1,24 +0,0 @@ - - -About XVM - - - - - - - -

About XVM

- -

XVM is an experimental service from the Student Information Processing Board which attempts to provide members of the MIT community with an easy way to create virtual machines which they can remotely administer. You can see more information about the project at http://xvm.mit.edu.

- -

When using XVM, please remember that, while VM disks are stored on a RAID, we do not back up data, so you shouldn't rely on XVM for data integrity.

- -

We hope you enjoy using and helping us test XVM.

- -
-Questions? Contact xvm@mit.edu. - - diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl index e1d66c4..43de904 100644 --- a/code/templates/list.tmpl +++ b/code/templates/list.tmpl @@ -1,4 +1,5 @@ #from skeleton import skeleton +#from invirt.config import structs as config #extends skeleton #import datetime @@ -191,7 +192,7 @@ $helppopup('Administrator')#slurp #def body -

What is XVM?

+

What is XVM?

#if not $machines

You don't currently control any VMs.

#end if diff --git a/code/templates/unauth.tmpl b/code/templates/unauth.tmpl index df06dda..fa34415 100644 --- a/code/templates/unauth.tmpl +++ b/code/templates/unauth.tmpl @@ -33,6 +33,15 @@ certificate.

  • Ownership and access control through Athena lockers and groups
  • +

    XVM does not feature:

    + +

    The XVM code base is a free software project under development, licensed under GPLv2+. If you're interested in using it, we'd be happy to help you set it up in your environment. Our Subversion diff --git a/config.todo b/config.todo index a6abc51..6462ecd 100644 --- a/config.todo +++ b/config.todo @@ -13,8 +13,6 @@ code/templates/skeleton.tmpl: SIPB Virtual Servers (twice) code/templates/skeleton.tmpl: xvm@mit.edu code/templates/unauth.tmpl: tons of text code/templates/unauth.tmpl: https://xvm.mit.edu -code/static/about.html: tons of text -code/static/about.html: SIPB Virtual Servers # will take real code to generalize code/getafsgroups.py: lockers, /mit -- 1.7.9.5