Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep HTTPIE_VERIFY_SSL value if already set and '--insecure' option is set to 'false'.

Browse Source
This commit is contained in:
Tortue Torche 2019-10-29 11:19:31 +01:00
parent fc338007f1
commit 8838d49d6e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Fixed
- If the `--insecure` option is set to `false` and the `HTTPIE_VERIFY_SSL` environment variable is set, we keep its value instead of overwrite it to `yes`.
Useful when we want to use Custom <abbr title="Certificate Authority">CA</abbr> (e.g. `HTTPIE_VERIFY_SSL=/etc/ssl/certs/ca-certificates.crt`). For more information, you can read the [HTTPie docs](https://httpie.org/doc/1.0.3#custom-ca-bundle)
## [1.0.0] - 2019-07-25 ## [1.0.0] - 2019-07-25
### Added ### Added
- New actions: `ls`, `status`, `services`, `tasks`, `tasks:healthy`, `containers`, `login`, `lint`, `inspect`, `system:info`, `actions`, `help` and `version` - New actions: `ls`, `status`, `services`, `tasks`, `tasks:healthy`, `containers`, `login`, `lint`, `inspect`, `system:info`, `actions`, `help` and `version`

2
psu
View File

@ -567,7 +567,7 @@ inputs() {
if [ "$insecure" == "true" ]; then if [ "$insecure" == "true" ]; then
HTTPIE_VERIFY_SSL="no" HTTPIE_VERIFY_SSL="no"
else else
HTTPIE_VERIFY_SSL="yes" HTTPIE_VERIFY_SSL="${HTTPIE_VERIFY_SSL:-"yes"}"
fi fi
if [ "$HTTPIE_VERIFY_SSL" == "no" ] && [ -z "$PYTHONWARNINGS" ]; then if [ "$HTTPIE_VERIFY_SSL" == "no" ] && [ -z "$PYTHONWARNINGS" ]; then
# Fix httpie with Debian and Ubuntu # Fix httpie with Debian and Ubuntu