samply
/
bridgehead
mirror of https://github.com/samply/bridgehead.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comment out HTTP proxy parsing

This commit is contained in:
Tobias Kussel 2023-10-23 11:06:59 +00:00
parent 9fc8564e4e
commit e0990d99cb
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/functions.sh
View File

@ -10,18 +10,21 @@ detectCompose() {
}
setupProxy() {
### Note: As the current data protection concepts do not allow communication via HTTP, this
### handling of a proxy for HTTP requests is commented out and will not be used
#
http="no"
if [ $HTTP_PROXY_URL ]; then
if [[ ! -z "$HTTP_PROXY_USERNAME" && ! -z "$HTTP_PROXY_PASSWORD" ]]; then
proto="$(echo $HTTP_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"
fqdn="$(echo ${HTTP_PROXY_URL/$proto/})"
HTTP_PROXY_FULL_URL="$(echo $proto$HTTP_PROXY_USERNAME:$HTTP_PROXY_PASSWORD@$fqdn)"
http="authenticated"
else
HTTP_PROXY_FULL_URL=$HTTP_PROXY_URL
http="unauthenticated"
fi
fi
# if [ $HTTP_PROXY_URL ]; then
# if [[ ! -z "$HTTP_PROXY_USERNAME" && ! -z "$HTTP_PROXY_PASSWORD" ]]; then
# proto="$(echo $HTTP_PROXY_URL | grep :// | sed -e's,^\(.*://\).*,\1,g')"
# fqdn="$(echo ${HTTP_PROXY_URL/$proto/})"
# HTTP_PROXY_FULL_URL="$(echo $proto$HTTP_PROXY_USERNAME:$HTTP_PROXY_PASSWORD@$fqdn)"
# http="authenticated"
# else
# HTTP_PROXY_FULL_URL=$HTTP_PROXY_URL
# http="unauthenticated"
# fi
# fi
https="no"
if [ $HTTPS_PROXY_URL ]; then

4
lib/update-bridgehead.sh
View File

@ -54,8 +54,8 @@ for DIR in /etc/bridgehead $(pwd); do
log "INFO" "Git is using no proxy!"
OUT=$(retry 5 git -C $DIR fetch 2>&1 && retry 5 git -C $DIR pull 2>&1)
else
log "INFO" "Git is using proxy ${HTTP_PROXY_URL} from ${CONFFILE}"
OUT=$(retry 5 git -c http.proxy=$HTTP_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR fetch 2>&1 && retry 5 git -c http.proxy=$HTTP_PROXY_FULL_URL -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR pull 2>&1)
log "INFO" "Git is using proxy ${HTTPS_PROXY_URL} from ${CONFFILE}"
OUT=$(retry 5 git -c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR fetch 2>&1 && retry 5 git-c https.proxy=$HTTPS_PROXY_FULL_URL -C $DIR pull 2>&1)
fi
if [ $? -ne 0 ]; then
report_error log "Unable to update git $DIR: $OUT"