extras-buildsys/www/template main.psp,1.1,1.2

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2796/www/template

Modified Files:
	main.psp 
Log Message:
2005-07-26  Dan Williams <dcbw at redhat.com>

    - www/config.psp
      www/templates/main.psp
        - Move config-type stuff for SSL to config.psp




Index: main.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/main.psp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.psp	21 Jul 2005 04:07:55 -0000	1.1
+++ main.psp	26 Jul 2005 23:38:57 -0000	1.2
@@ -5,11 +5,12 @@
 from OpenSSL import SSL
 
 certs = {}
-certs['key_and_cert'] = "/var/www/certs/fedora.cert"
-certs['ca_cert'] = "/var/www/certs/fedora-upload-ca.cert"
-certs['peer_ca_cert'] = "/var/www/certs/fedora-server-ca.cert"
+certs['key_and_cert'] = config_opts['user_cert']
+certs['ca_cert'] = config_opts['user_ca_cert']
+certs['peer_ca_cert'] = config_opts['server_ca_cert']
 
-server = XMLRPCServerProxy.PlgXMLRPCServerProxy("https://flare.boston.redhat.com:8887", certs)
+hostname_string = "https://%s:8887" % config_opts['server']
+server = XMLRPCServerProxy.PlgXMLRPCServerProxy(hostname_string, certs)
 
 action = 'status'
 user_email = ''