extras-buildsys/builder builder.py,1.21,1.22

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/builder

Modified Files:
	builder.py 
Log Message:
2005-07-20  Dan Williams <dcbw at redhat.com>

    * builder/builder.py
      server/main.py
        - Don't use lighttpd any more
        - Fix some issues with non-SSL build systems (Oliver Falk)

    * client/client.py
      server/UserInterface.py
        - Return job lists as dicts for easier use
        - Return archjobs embedded in the job list rather than a separate array




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- builder.py	18 Jul 2005 21:26:24 -0000	1.21
+++ builder.py	20 Jul 2005 14:51:48 -0000	1.22
@@ -33,14 +33,11 @@
 from plague import ArchUtils
 from plague import FileDownloader
 from plague import AuthedXMLRPCServer
-from plague import lighttpdManager
 from plague import HTTPServer
 from plague import daemonize
 from optparse import OptionParser
 
 
-use_lighttpd = False
-
 certs = {}
 
 def get_url_for_file(file_path):
@@ -681,9 +678,10 @@
 
     # Load in the config
     execfile(opts.configfile)
-    certs['key_and_cert'] = config_opts['builder_key_and_cert']
-    certs['ca_cert'] = config_opts['ca_cert']
-    certs['peer_ca_cert'] = config_opts['ca_cert']
+    if config_opts['ssl_buildserver']:
+        certs['key_and_cert'] = config_opts['builder_key_and_cert']
+        certs['ca_cert'] = config_opts['ca_cert']
+        certs['peer_ca_cert'] = config_opts['ca_cert']
 
     for arch in config_opts['arches']:
         if arch not in archlist:
@@ -725,18 +723,7 @@
     # Start up the HTTP server thread which the build server
     # pulls completed RPMs from
     port = config_opts['fileserver_port']
-    if use_lighttpd:
-        http_cnf_file = "/var/tmp/plague-builder-%s.conf" % os.getpid()
-        if config_opts['ssl_buildserver']:
-            key_and_cert = config_opts['builder_key_and_cert']
-        else:
-            key_and_cert = None
-        http_server = lighttpdManager.lighttpdManager(http_cnf_file, config_opts['hostname'], port, work_dir, True, key_and_cert)
-    else:
-        if config_opts['ssl_buildserver']:
-            http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs)
-        else:
-            http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, None)
+    http_server = HTTPServer.PlgHTTPServerManager((config_opts['hostname'], port), work_dir, certs)
     http_server.start()
 
     # Stop running as root