From 06f477410b768d8e859fb59d99342f5e54de8781 Mon Sep 17 00:00:00 2001 From: Christian Tramnitz Date: Wed, 23 Oct 2019 01:56:19 +0200 Subject: [PATCH 1/2] inherit proxy settings on install Write proxy settings into FILE_K3S_ENV on install. This should address #627 --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index 867c3d9015..1c2f3b159f 100755 --- a/install.sh +++ b/install.sh @@ -567,6 +567,7 @@ create_env_file() { UMASK=$(umask) umask 0377 env | grep '^K3S_' | $SUDO tee ${FILE_K3S_ENV} >/dev/null + env | egrep '^(NO|HTTP|HTTPS)_PROXY' | $SUDO tee -a ${FILE_K3S_ENV} >/dev/null umask $UMASK } From 7b37988fb16a54b2d6064d479e2f121e437cbf6b Mon Sep 17 00:00:00 2001 From: Christian Tramnitz Date: Wed, 23 Oct 2019 02:00:10 +0200 Subject: [PATCH 2/2] make match case-insensitive --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 1c2f3b159f..af364eb6a8 100755 --- a/install.sh +++ b/install.sh @@ -567,7 +567,7 @@ create_env_file() { UMASK=$(umask) umask 0377 env | grep '^K3S_' | $SUDO tee ${FILE_K3S_ENV} >/dev/null - env | egrep '^(NO|HTTP|HTTPS)_PROXY' | $SUDO tee -a ${FILE_K3S_ENV} >/dev/null + env | egrep -i '^(NO|HTTP|HTTPS)_PROXY' | $SUDO tee -a ${FILE_K3S_ENV} >/dev/null umask $UMASK }