Changeset 879 for trunk

Timestamp:

Aug 8, 2008, 2:41:38 AM (16 years ago)

Author:

y_z

Message:

• further integration of invirt.config

Location:

trunk/packages/sipb-xen-www

Files:

• code/cache_acls.py (modified) (2 diffs)
• code/controls.py (modified) (1 diff)
• code/main.py (modified) (1 diff)
• code/validation.py (modified) (2 diffs)
• config.todo (modified) (1 diff)
• debian/changelog (modified) (1 diff)

trunk/packages/sipb-xen-www/code/cache_acls.py

@@ -1 +1 @@
 #!/usr/bin/python
 from invirt.database import *
+from invirt.config import structs as config
 import sys
 import getafsgroups
@@ -30 +31 @@
         return []
     try:
-        return getafsgroups.getAfsGroupMembers(name, 'athena.mit.edu')
+        return getafsgroups.getAfsGroupMembers(name, config.authz[0].cell)
     except getafsgroups.AfsProcessError:
         return []

trunk/packages/sipb-xen-www/code/controls.py

@@ -133 +133 @@
         if not open_nics: #No IPs left!
             raise CodeError("No IP addresses left!  "
-                            "Contact xvm@mit.edu.")
+                            "Contact %s." % config.web.errormail)
         nic = open_nics[0]
         nic.machine_id = machine.machine_id

trunk/packages/sipb-xen-www/code/main.py

@@ -650 +650 @@
              errorMessage=str(err), stderr=emsg, traceback=traceback)
     details = templates.error_raw(searchList=[d])
-    if username not in ('price', 'ecprice', 'andersk'): #add yourself at will
+    if username not in config.web.errormail_exclude:
         send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
                         details)

trunk/packages/sipb-xen-www/code/validation.py

@@ -6 +6 @@
 import string
 from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
+from invirt.config import structs as config
 from webcommon import InvalidInput
 
@@ -224 +225 @@
         admin = 'system:' + admin
     try:
-        if user in getafsgroups.getAfsGroupMembers(admin, 'athena.mit.edu'):
+        if user in getafsgroups.getAfsGroupMembers(admin, config.authz[0].cell):
             return admin
     except getafsgroups.AfsProcessError, e:

trunk/packages/sipb-xen-www/config.todo

@@ -11 +11 @@
 files/etc/apache2/sites-available/svn: svn repo path
 files/etc/init.d/apache2.invirt: afs cell (for svn?)
-code/cache_acls.py: afs cell for authz
-code/controls.py: xvm@mit.edu
-code/main.py: error-mail blacklist: price, etc
-code/validation.py: afs cell for authz
 code/templates/error.tmpl: xvm@mit.edu
 code/templates/help.tmpl: assumes trac

trunk/packages/sipb-xen-www/debian/changelog

@@ +1 @@
+sipb-xen-www (3.9) unstable; urgency=low
+
+  * further integration of invirt.config
+
+ -- Yang Zhang <y_z@mit.edu>  Fri,  8 Aug 2008 02:39:15 -0400
+
+sipb-xen-www (3.8) unstable; urgency=low
+
+  * sipb_xen_database -> invirt.database in cache_acls.py
+
+ -- Yang Zhang <y_z@mit.edu>  Sun,  3 Aug 2008 19:45:19 -0400
+
 sipb-xen-www (3.7) unstable; urgency=low