configurize some web code

[invirt/packages/invirt-web.git] / code / main.py

diff --git a/code/main.py b/code/main.py
index 03d7eb1..a9e54a8 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -34,15 +34,15 @@ if __name__ == '__main__':
 
 import templates
 from Cheetah.Template import Template
 
 import templates
 from Cheetah.Template import Template

-import sipb_xen_database
-from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall

 import validation
 import cache_acls
 from webcommon import InvalidInput, CodeError, State
 import controls
 from getafsgroups import getAfsGroupMembers
 import validation
 import cache_acls
 from webcommon import InvalidInput, CodeError, State
 import controls
 from getafsgroups import getAfsGroupMembers

-import invirt.config
-invirt_config = invirt.config.load()
+import sipb_xen_database
+from invirt import database
+from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
+from invirt.config import structs as config

 
 def pathSplit(path):
     if path.startswith('/'):
 
 def pathSplit(path):
     if path.startswith('/'):

@@ -259,8 +259,7 @@ def vnc(username, state, path, fields):
     token = base64.urlsafe_b64encode(token)
     host = controls.listHost(machine)
     if host:
     token = base64.urlsafe_b64encode(token)
     host = controls.listHost(machine)
     if host:

-        port = 10003 + [config_host["hostname"] for config_host in invirt_config["hosts"]
-            ].index(host)
+        port = 10003 + [h.hostname for h in config.hosts].index(host)

     else:
         port = 5900 # dummy
 
     else:
         port = 5900 # dummy
 

@@ -284,7 +283,7 @@ def getHostname(nic):
     if nic.hostname and '.' in nic.hostname:
         return nic.hostname
     elif nic.machine:
     if nic.hostname and '.' in nic.hostname:
         return nic.hostname
     elif nic.machine:

-        return nic.machine.name + '.xvm.mit.edu'
+        return nic.machine.name + '.' + config.dns.domains[0]

     else:
         return None
 
     else:
         return None
 

@@ -441,8 +440,8 @@ def helpHandler(username, state, path, fields):
     help_mapping = {'ParaVM Console': """
 ParaVM machines do not support local console access over VNC.  To
 access the serial console of these machines, you can SSH with Kerberos
     help_mapping = {'ParaVM Console': """
 ParaVM machines do not support local console access over VNC.  To
 access the serial console of these machines, you can SSH with Kerberos

-to console.xvm.mit.edu, using the name of the machine as your
-username.""",
+to console.%s, using the name of the machine as your
+username.""" % config.dns.domains[0],

                     'HVM/ParaVM': """
 HVM machines use the virtualization features of the processor, while
 ParaVM machines use Xen's emulation of virtualization features.  You
                     'HVM/ParaVM': """
 HVM machines use the virtualization features of the processor, while
 ParaVM machines use Xen's emulation of virtualization features.  You

@@ -631,13 +630,13 @@ def printHeaders(headers):
 def send_error_mail(subject, body):
     import subprocess
 
 def send_error_mail(subject, body):
     import subprocess
 

-    to = 'xvm@mit.edu'
+    to = config.web.errormail

     mail = """To: %s
     mail = """To: %s

-From: root@xvm.mit.edu
+From: root@%s

 Subject: %s
 
 %s
 Subject: %s
 
 %s

-""" % (to, subject, body)
+""" % (to, config.web.hostname, subject, body)

     p = subprocess.Popen(['/usr/sbin/sendmail', to], stdin=subprocess.PIPE)
     p.stdin.write(mail)
     p.stdin.close()
     p = subprocess.Popen(['/usr/sbin/sendmail', to], stdin=subprocess.PIPE)
     p.stdin.write(mail)
     p.stdin.close()

@@ -732,7 +731,7 @@ class App:
             yield '<pre>%s</pre>' % cgi.escape(str(checkpoint))
 
 def constructor():
             yield '<pre>%s</pre>' % cgi.escape(str(checkpoint))
 
 def constructor():

-    connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+    connect()

     return App
 
 def main():
     return App
 
 def main():