diff options
| author | Timo <6674623+underhood@users.noreply.github.com> | 2020-03-25 09:17:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 09:17:51 +0100 |
| commit | a8e9fcb3630ebdcc92d895a6d8bf3e1c9a588a35 (patch) | |
| tree | 0e8ee2f698dcd4e97fa1ed342b45bc59b9a0e2c4 /claim/netdata-claim.sh.in | |
| parent | 82211d07b42f6a6dd365cafd34089e48e5411850 (diff) | |
HTTP proxy support + some cleanup (#8418)
* HTTP proxy support + some cleanup
* fix unrelated compiler warnings with -Wextra
* minor - log proxy setting
* run changed code trough .clang-format
* fix case when url ends by /
* update README
Diffstat (limited to 'claim/netdata-claim.sh.in')
| -rwxr-xr-x | claim/netdata-claim.sh.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in index 6284868aa7..aef8de4b63 100755 --- a/claim/netdata-claim.sh.in +++ b/claim/netdata-claim.sh.in @@ -129,7 +129,7 @@ do -hostname=*) HOSTNAME=${arg:10} ;; -verbose) VERBOSE=1 ;; -insecure) INSECURE=1 ;; - -proxy=socks*) PROXY=${arg:7} ;; + -proxy=*) PROXY=${arg:7} ;; -noproxy) NOPROXY=yes ;; *) echo >&2 "Unknown argument ${arg}" exit 1 ;; @@ -148,6 +148,7 @@ echo >&2 "Base URL: $URL_BASE" echo >&2 "Id: $ID" echo >&2 "Rooms: $ROOMS" echo >&2 "Hostname: $HOSTNAME" +echo >&2 "Proxy: $PROXY" # create the claiming directory for this user if [ ! -d "${CLAIMING_DIR}" ] ; then @@ -214,6 +215,8 @@ else --body-file=\"${CLAIMING_DIR}/tmpin.txt\"" if [ "${NOPROXY}" = "yes" ] ; then URLCOMMAND="${URLCOMMAND} --no-proxy" + elif [ "${PROXY:0:4}" = http ] ; then + URLCOMMAND="export http_proxy=${PROXY}; ${URLCOMMAND}" fi fi |