From 1f5f3ed5e1fda2149c7e9caabef7865e6fe73b13 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Dec 09 2016 04:12:59 +0000 Subject: [PATCH 1/2] Use system trust list for lookaside Signed-off-by: Patrick Uiterwijk --- diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py index 66fad7a..159ed29 100644 --- a/fedpkg/__init__.py +++ b/fedpkg/__init__.py @@ -99,10 +99,9 @@ class Commands(pyrpkg.Commands): def ca_cert(self): """A CA certificate to authenticate the server in SSL connections - We override this from pyrpkg because we actually need a custom - CA certificate. + We now use the system trust list. """ - return os.path.expanduser('~/.fedora-server-ca.cert') + return None @cached_property def lookasidecache(self): From dbc51ba1e2d989253d3b680d2d9a4b50669073f5 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Dec 09 2016 04:33:04 +0000 Subject: [PATCH 2/2] Update config with new lookaside url Signed-off-by: Patrick Uiterwijk --- diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf index c1f34f5..98e59d0 100644 --- a/conf/etc/rpkg/fedpkg-stage.conf +++ b/conf/etc/rpkg/fedpkg-stage.conf @@ -1,7 +1,7 @@ [fedpkg-stage] -lookaside = http://pkgs.stg.fedoraproject.org/repo/pkgs +lookaside = https://src.stg.fedoraproject.org/repo/pkgs lookasidehash = md5 -lookaside_cgi = https://pkgs.stg.fedoraproject.org/repo/pkgs/upload.cgi +lookaside_cgi = https://src.stg.fedoraproject.org/repo/pkgs/upload.cgi gitbaseurl = ssh://%(user)s@pkgs.stg.fedoraproject.org/%(module)s anongiturl = git://pkgs.stg.fedoraproject.org/%(module)s tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf index e2d985c..87a4498 100644 --- a/conf/etc/rpkg/fedpkg.conf +++ b/conf/etc/rpkg/fedpkg.conf @@ -1,7 +1,7 @@ [fedpkg] -lookaside = http://pkgs.fedoraproject.org/repo/pkgs +lookaside = https://src.fedoraproject.org/repo/pkgs lookasidehash = sha512 -lookaside_cgi = https://pkgs.fedoraproject.org/repo/pkgs/upload.cgi +lookaside_cgi = https://src.fedoraproject.org/repo/pkgs/upload.cgi gitbaseurl = ssh://%(user)s@pkgs.fedoraproject.org/%(module)s anongiturl = git://pkgs.fedoraproject.org/%(module)s tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc