GitList

Browse code

Use proper python when configuring certs

We have to do silly overrides of cert locations for requests for
reasons. If we are running under python3 then we were previously looking
in the wrong location for the requests certs. Update the cert fixing
function to properly use python3 to find the certs if python3 is
enabled.

Change-Id: Id1369da0d812edcf9b1204e9c567f8bfe77c48b2

Clark Boylan authored on 2017/05/28 12:53:20
Showing 2 changed files

lib/tls

History View file @ 4baac65

@@ -345,7 +345,8 @@ function make_root_CA {
                      function fix_system_ca_bundle_path {
                          if is_service_enabled tls-proxy; then
                              local capath
                     -        capath=$(python -c $'try:\n from requests import certs\n print certs.where()\nexcept ImportError: pass')
                     +        local python_cmd=${1:-python}
                     +        capath=$($python_cmd -c $'try:\n from requests import certs\n print (certs.where())\nexcept ImportError: pass')
                              if [[ ! $capath == "" && ! $capath =~ ^/etc/.* && ! -L $capath ]]; then
                                  if is_fedora; then

stack.sh

History View file @ 4baac65

@@ -888,6 +888,9 @@ fi
                      if is_service_enabled tls-proxy; then
                          fix_system_ca_bundle_path
                     +    if python3_enabled ; then
                     +        fix_system_ca_bundle_path python3
                     +    fi
                      fi
                      # Extras Install