Repository: libcloud Updated Branches: refs/heads/trunk dff5c5314 -> ffb63c2af
Update CA_CERTS_PATH to look for updated Homebrew location on MacOS X. Closes #309 Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ffb63c2a Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ffb63c2a Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ffb63c2a Branch: refs/heads/trunk Commit: ffb63c2af95d05888cdda8e0923a0f91636f15c8 Parents: dff5c53 Author: Pedro Romano <[email protected]> Authored: Wed Jun 4 15:46:47 2014 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Thu Jun 5 11:34:16 2014 +0200 ---------------------------------------------------------------------- CHANGES.rst | 7 ++++++- libcloud/security.py | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/ffb63c2a/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index 2870bc7..c359359 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -28,10 +28,15 @@ General (GITHUB-301) [Csaba Hoch] +- Update CA_CERTS_PATH to also look for CA cert bundle which comes with + openssl Homebrew formula on OS x (/usr/local/etc/openssl/cert.pem). + (GITHUB-309) + [Pedro Romano] + Compute ~~~~~~~ -- Fix create_key_pair method which was not returning private key. +- Fix create_key_pair method which was not returning private key. (LIBCLOUD-566) [Sebastien Goasguen] http://git-wip-us.apache.org/repos/asf/libcloud/blob/ffb63c2a/libcloud/security.py ---------------------------------------------------------------------- diff --git a/libcloud/security.py b/libcloud/security.py index 8be810d..81d7a51 100644 --- a/libcloud/security.py +++ b/libcloud/security.py @@ -42,7 +42,10 @@ CA_CERTS_PATH = [ # macports: curl-ca-bundle '/opt/local/share/curl/curl-ca-bundle.crt', - # homebrew: curl-ca-bundle + # homebrew: openssl + '/usr/local/etc/openssl/cert.pem', + + # homebrew: curl-ca-bundle (backward compatibility) '/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt', ]
