From 9240cf68a78001c06d7c4c643660d1a969e768d2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Aug 02 2012 23:27:42 +0000 Subject: dont write out arch configs for secondary arches fix up message for browser import --- diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py index e096d42..461e701 100755 --- a/src/fedora-packager-setup.py +++ b/src/fedora-packager-setup.py @@ -24,39 +24,6 @@ import fedora_cert import pycurl -def write_arch_config(arch, file): - config_file = open(file, "w") - config_file.write("""[koji] - -;configuration for koji cli tool - -;url of XMLRPC server -server = http://%s.koji.fedoraproject.org/kojihub - -;url of web interface -weburl = http://%s.koji.fedoraproject.org/koji - -;url of package download site -pkgurl = http://%s.koji.fedoraproject.org/packages - -;path to the koji top directory -;topdir = /mnt/koji - -;configuration for SSL athentication - -;client certificate -cert = ~/.fedora.cert - -;certificate of the CA that issued the client certificate -ca = ~/.fedora-upload-ca.cert - -;certificate of the CA that issued the HTTP server certificate -serverca = ~/.fedora-server-ca.cert - -""" % (arch, arch, arch)) - config_file.close() - print "Wrote %s koji config file" % arch - def generate_browser_cert(): '''Convert the user cert to the format for importing into a browser''' os.system('/usr/bin/openssl pkcs12 -export -in ~/.fedora.cert -CAfile ~/.fedora-upload-ca.cert -out ~/fedora-browser-cert.p12') @@ -76,6 +43,9 @@ Once imported, you should see a certificate named "Fedora Project". Your username should appear underneath this. You should now be able to click the "login" link at http://koji.fedoraproject.org/koji/ successfully. + +importing the certificate is optional and not needed for daily use. +you should also import the ca cert at ~/.fedora-upload-ca.cert """ @@ -130,16 +100,6 @@ def main(): if os.path.exists(upload_ca_cert): os.unlink(upload_ca_cert) os.symlink(server_ca_cert, upload_ca_cert) - if not os.path.isdir(os.path.join(user_home, '.koji')): - os.mkdir(os.path.join(user_home, '.koji')) - for arch in ['sparc', 'arm', 'alpha', 's390', 'hppa', 'ppc', 'mips']: - config_file = '%s/.koji/%s-config' % (user_home, arch) - if not os.path.isfile(config_file): - write_arch_config(arch, config_file) - else: - print "koji config for %s exists. Replacing with new file." % arch - os.unlink(config_file) - write_arch_config(arch, config_file) print 'Setting up Browser Certificates' generate_browser_cert()