irt/gists
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Upgraded docker-proxyscript to handle multiple services

Browse Source
This commit is contained in:
tke
2022-11-11 15:33:40 +01:00
parent eeb37a629a
commit d2b0d060ef
2 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
systemscripts/proxy/update_docker_proxy.sh
View File

@@ -1,42 +0,0 @@
#!/bin/bash
function restart_docker(){
sudo systemctl daemon-reload
sudo systemctl restart docker
#systemctl show docker -p Environment
}
#remove proxy settings from docker
if [[ "${1}" == "off" ]]; then
echo "TURNING OFF PROXY FOR DOCKER"
sudo rm -v /etc/systemd/system/docker.service.d/http-proxy.conf
restart_docker
exit 0
fi
#populate proxy_ip and proxy_port variables
path=$(dirname $(readlink -f "${0}"))
. "${path}/get_proxy.sh"
echo -n "Username: "
read username
echo -n "Password: "
read -s password
#encpassword=$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "${password}")
#encpassword=$(echo -n ${password} | sed -e 's/\@/\\x40/g' -e 's/\!/\\x21/g' -e 's/\$/\\x24/g' -e 's/\*/\\x2a/g' -e 's/\%/\\x25/g' -e 's/\&/\\x26/g' -e 's/\#/\\x30/g')
encpassword=$(echo -n ${password} | xxd -p | sed -e 's/\(..\)/%%\1/g' )
if ! [[ -d "/etc/systemd/system/docker.service.d" ]] ; then
sudo mkdir -p /etc/systemd/system/docker.service.d/
fi
echo "[Service]" | sudo tee /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
echo 'Environment="HTTP_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
echo 'Environment="HTTPS_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/" | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
if [[ -z "$NO_PROXY" ]] ; then
echo -n 'Environment="NO_PROXY=localhost,127.0.0.1"' | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
else
echo 'Environment="'$(env | grep NO_PROXY)'"' | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf >/dev/null
fi
restart_docker

51
systemscripts/proxy/update_service_proxy.sh Executable file
View File

@@ -0,0 +1,51 @@
#!/bin/bash
services=(docker fwupd snapd)
function restart_services(){
echo "Reloading Systemd - Configfiles"
sudo systemctl daemon-reload
for service in ${services[*]} ; do
echo "Restarting Service $service"
sudo systemctl restart $service
done
}
#remove proxy settings from docker
if [[ "${1}" == "off" ]]; then
for service in ${services[*]} ; do
echo "TURNING OFF PROXY FOR ${service^^}"
sudo rm -v "/etc/systemd/system/${service}.service.d/http-proxy.conf"
done
restart_services
exit 0
fi
#populate proxy_ip and proxy_port variables
path=$(dirname $(readlink -f "${0}"))
. "${path}/get_proxy.sh"
echo -n "Username: "
read username
echo -n "Password: "
read -s password
#encpassword=$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "${password}")
#encpassword=$(echo -n ${password} | sed -e 's/\@/\\x40/g' -e 's/\!/\\x21/g' -e 's/\$/\\x24/g' -e 's/\*/\\x2a/g' -e 's/\%/\\x25/g' -e 's/\&/\\x26/g' -e 's/\#/\\x30/g')
encpassword=$(echo -n ${password} | xxd -p | sed -e 's/\(..\)/%%\1/g' )
for service in ${services[*]} ; do
if ! [[ -d "/etc/systemd/system/${service}.service.d" ]] ; then
sudo mkdir -p "/etc/systemd/system/${service}.service.d/"
fi
echo "[Service]" | sudo tee "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
echo 'Environment="HTTP_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/" | sudo tee -a "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
echo 'Environment="HTTPS_PROXY=http://'"${username}"':"'"${encpassword}@${proxy_ip}:${proxy_port}/" | sudo tee -a "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
if [[ -z "$NO_PROXY" ]] ; then
echo -n 'Environment="NO_PROXY=localhost,127.0.0.1"' | sudo tee -a "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
else
echo 'Environment="'$(env | grep NO_PROXY)'"' | sudo tee -a "/etc/systemd/system/${service}.service.d/http-proxy.conf" >/dev/null
fi
done
restart_services