diff --git a/env-ot11.sh b/env-ot11.sh index 3127671e..70465578 100644 --- a/env-ot11.sh +++ b/env-ot11.sh @@ -16,5 +16,5 @@ export LOCAL_ADDR6 FAKE_ADDR6 ftp_proxy=http://10.0.1.3:8000/ http_proxy=http://10.0.1.3:8000/ - -export ftp_proxy http_proxy +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot21.sh b/env-ot21.sh index f3f86567..ab175a48 100644 --- a/env-ot21.sh +++ b/env-ot21.sh @@ -1,8 +1,10 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy LOCAL_IF=cas1 LOCAL_MAC=00:03:ba:ac:b9:b4 diff --git a/env-ot26.sh b/env-ot26.sh index 1683ed17..c2d61512 100644 --- a/env-ot26.sh +++ b/env-ot26.sh @@ -16,5 +16,5 @@ export LOCAL_ADDR6 FAKE_ADDR6 ftp_proxy=http://10.0.1.3:8000/ http_proxy=http://10.0.1.3:8000/ - -export ftp_proxy http_proxy +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot27.sh b/env-ot27.sh index 3f59200c..c22b5785 100644 --- a/env-ot27.sh +++ b/env-ot27.sh @@ -16,5 +16,5 @@ export LOCAL_ADDR6 FAKE_ADDR6 ftp_proxy=http://10.0.1.3:8000/ http_proxy=http://10.0.1.3:8000/ - -export ftp_proxy http_proxy +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot29.sh b/env-ot29.sh index 5f3330a4..870eef7e 100644 --- a/env-ot29.sh +++ b/env-ot29.sh @@ -8,5 +8,5 @@ export LOCAL_IF LOCAL_MAC ftp_proxy=http://10.0.1.3:8000/ http_proxy=http://10.0.1.3:8000/ - -export ftp_proxy http_proxy +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot3.sh b/env-ot3.sh index af819c9d..7500d541 100644 --- a/env-ot3.sh +++ b/env-ot3.sh @@ -1,2 +1,4 @@ -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot33.sh b/env-ot33.sh index 4c3a3914..aa09f22c 100644 --- a/env-ot33.sh +++ b/env-ot33.sh @@ -1,5 +1,7 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot35.sh b/env-ot35.sh index 4c3a3914..aa09f22c 100644 --- a/env-ot35.sh +++ b/env-ot35.sh @@ -1,5 +1,7 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot44.sh b/env-ot44.sh index 4c3a3914..aa09f22c 100644 --- a/env-ot44.sh +++ b/env-ot44.sh @@ -1,5 +1,7 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot5.sh b/env-ot5.sh index 9afe1863..58c2237b 100644 --- a/env-ot5.sh +++ b/env-ot5.sh @@ -1,8 +1,10 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy LOCAL_IF=em0 LOCAL_MAC=90:e2:ba:7e:e8:10 diff --git a/env-ot50.sh b/env-ot50.sh index 4c3a3914..aa09f22c 100644 --- a/env-ot50.sh +++ b/env-ot50.sh @@ -1,5 +1,7 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot51.sh b/env-ot51.sh index 4c3a3914..aa09f22c 100644 --- a/env-ot51.sh +++ b/env-ot51.sh @@ -1,5 +1,7 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot52.sh b/env-ot52.sh index 4c3a3914..aa09f22c 100644 --- a/env-ot52.sh +++ b/env-ot52.sh @@ -1,5 +1,7 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot7.sh b/env-ot7.sh index 4c3a3914..aa09f22c 100644 --- a/env-ot7.sh +++ b/env-ot7.sh @@ -1,5 +1,7 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy diff --git a/env-ot8.sh b/env-ot8.sh index 4c3a3914..aa09f22c 100644 --- a/env-ot8.sh +++ b/env-ot8.sh @@ -1,5 +1,7 @@ export REGRESS_FAIL_EARLY=no export TEST_SSH_UNSAFE_PERMISSIONS=yes -export ftp_proxy=http://10.0.1.3:8000/ -export http_proxy=http://10.0.1.3:8000/ +ftp_proxy=http://10.0.1.3:8000/ +http_proxy=http://10.0.1.3:8000/ +https_proxy=http://10.0.1.3:8000/ +export ftp_proxy http_proxy https_proxy