From db210597cfb40aa3d39172e12eb1a8f7fa4e6739 Mon Sep 17 00:00:00 2001 From: shokinn Date: Fri, 29 Nov 2024 11:24:14 +0100 Subject: [PATCH] Update proxy env configurations to support tailscale --- dotfiles/commonfunc | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dotfiles/commonfunc b/dotfiles/commonfunc index eb17506..1d90015 100644 --- a/dotfiles/commonfunc +++ b/dotfiles/commonfunc @@ -369,6 +369,21 @@ setProxyEnv() { export https_proxy="${PROXY_CFG_HTTPS}" export GIT_SSH_COMMAND='ssh -o ProxyCommand="/opt/homebrew/bin/corkscrew localhost 9000 %h %p"' + [[ -d "{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macsys/Data" ]] && local TAILSCALEPATH="{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macsys/Data/tailscaled-env.txt" || true + [[ -d "{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macos.network-extension/Data" ]] && local TAILSCALEPATH="{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macos.network-extension/Data/tailscaled-env.txt" || true + [[ -d "/etc/tailscale" ]] && local TAILSCALEPATH="/etc/tailscale/tailscaled-env.txt" || true + if [[ -n ${TAILSCALEPATH} ]]; then + cat < "${TAILSCALEPATH}" +NO_PROXY="${NO_PROXY_CFG}" +no_proxy="${NO_PROXY_CFG}" +HTTP_PROXY="${PROXY_CFG_HTTP}" +HTTPS_PROXY="${PROXY_CFG_HTTPS}" +http_proxy="${PROXY_CFG_HTTP}" +https_proxy="${PROXY_CFG_HTTPS}" + +EOF + fi + echo -e "\n✈️ exported zscaler proxy: ${HIGHLIGHT}http://${PROXY}${RESET}" } @@ -381,6 +396,14 @@ unsetProxyEnv() { unset https_proxy unset GIT_SSH_COMMAND + [[ -d "{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macsys/Data" ]] && local TAILSCALEPATH="{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macsys/Data/tailscaled-env.txt" || true + [[ -d "{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macos.network-extension/Data" ]] && local TAILSCALEPATH="{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macos.network-extension/Data/tailscaled-env.txt" || true + [[ -d "/etc/tailscale" ]] && local TAILSCALEPATH="/etc/tailscale/tailscaled-env.txt" || true + + if [[ -n ${TAILSCALEPATH} ]]; then + rm "${TAILSCALEPATH}" + fi + echo -e "\n🔄 removed zscaler proxy cofiguration" }