extras-buildsys/client client.py,1.4,1.5

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * We now use lighttpd as the fileserver in both the server and the builder.  It's
        a lot more robust than the python implementation, but the python implementation
        code still exists and can be used.

    * The server key and certificate must now be in the same file.  You can 'cat' them
        together with 'cat key.pem cert.pem > key_and_cert.pem'

    * Initialize m2crypto threading in buildservery.py and builder.py

    * Change some config options for the builder that said 'client' to 'builder'

    * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py




Index: client.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/client.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- client.py	29 Jun 2005 20:27:12 -0000	1.4
+++ client.py	1 Jul 2005 11:51:27 -0000	1.5
@@ -28,7 +28,6 @@
 config = ConfigParser.ConfigParser()
 config.add_section('Certs')
 config.set('Certs', 'user-cert', '~/.fedora.cert')
-config.set('Certs', 'user-key', '')
 config.set('Certs', 'user-ca-cert', '~/.fedora-upload-ca.cert')
 config.set('Certs', 'server-ca-cert', '~/.fedora-server-ca.cert')
 
@@ -187,12 +186,7 @@
             raise ServerException("Error: '%s' is not an SSL server, but the use_ssl config option set to True.  See %s" % (addr, config_file_path))
         else:
             certs = {}
-            certs['cert'] = os.path.expanduser(config.get('Certs', 'user-cert'))
-            client_key = config.get('Certs', 'user-key')
-            # If client-key is empty, key assumed to be in user-cert
-            certs['key'] = None
-            if len(client_key) > 0:
-                certs['key'] = os.path.expanduser(client_key)
+            certs['key_and_cert'] = os.path.expanduser(config.get('Certs', 'user-cert'))
             certs['ca_cert'] = os.path.expanduser(config.get('Certs', 'user-ca-cert'))
             certs['peer_ca_cert'] = os.path.expanduser(config.get('Certs', 'server-ca-cert'))
             server = SSLXMLRPCServerProxy.SSLXMLRPCServerProxy(certs, config.get('Server', 'address'))