diff options
Diffstat (limited to 'lib/license/management')
| -rw-r--r-- | lib/license/management/python.rb | 4 | ||||
| -rw-r--r-- | lib/license/management/shell.rb | 3 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/license/management/python.rb b/lib/license/management/python.rb index 740b5c4..ede792e 100644 --- a/lib/license/management/python.rb +++ b/lib/license/management/python.rb @@ -54,9 +54,7 @@ module License end def default_env - return {} unless shell.custom_certificate_installed? - - { 'PIP_CERT' => ENV.fetch('PIP_CERT', shell.custom_certificate_path.to_s) } + { 'PIP_CERT' => ENV.fetch('PIP_CERT', shell.default_certificate_path).to_s } end end end diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb index 47639df..1a99895 100644 --- a/lib/license/management/shell.rb +++ b/lib/license/management/shell.rb @@ -4,11 +4,12 @@ module License module Management class Shell SPLIT_SCRIPT = "'BEGIN {x=0;} /BEGIN CERT/{x++} { print > \"custom.\" x \".crt\" }'" - attr_reader :custom_certificate_path, :logger + attr_reader :default_certificate_path, :custom_certificate_path, :logger def initialize(logger: License::Management.logger, certificate: ENV['ADDITIONAL_CA_CERT_BUNDLE']) @logger = logger @custom_certificate_path = Pathname.new('/usr/local/share/ca-certificates/custom.crt') + @default_certificate_path = Pathname.new('/etc/ssl/certs/ca-certificates.crt') trust!(certificate) if present?(certificate) end diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 5402857..d9e2383 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.19.1' + VERSION = '3.19.2' end end |
