diff options
| author | Philip Hands <phil@hands.com> | 2016-05-12 00:09:16 +0200 |
|---|---|---|
| committer | Philip Hands <phil@hands.com> | 2016-05-12 00:33:42 +0200 |
| commit | d63a532c80b01ae6197eca43b8e560c916131428 (patch) | |
| tree | df5991469c6216b89d114b3a1929f0e7c241ad6c | |
| parent | 4ca3bb793bc249b260ef255740781bd5ae84baff (diff) | |
| download | jenkins.debian.net-d63a532c80b01ae6197eca43b8e560c916131428.tar.xz | |
unkludge squid, and unset http_proxy
| -rwxr-xr-x | cucumber/bin/run_test_suite | 2 | ||||
| -rw-r--r-- | hosts/jenkins-test-vm/etc/squid3/squid.conf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cucumber/bin/run_test_suite b/cucumber/bin/run_test_suite index 86e7ea7d..7d175f35 100755 --- a/cucumber/bin/run_test_suite +++ b/cucumber/bin/run_test_suite @@ -273,4 +273,6 @@ RUBY_STDOUT_SYNC=$TMPDIR/.stdout-sync.rb echo STDOUT.sync = true > $RUBY_STDOUT_SYNC export RUBYOPT="-r $RUBY_STDOUT_SYNC" +unset http_proxy + cucumber ${@} diff --git a/hosts/jenkins-test-vm/etc/squid3/squid.conf b/hosts/jenkins-test-vm/etc/squid3/squid.conf index 27b15593..d3a0a7f1 100644 --- a/hosts/jenkins-test-vm/etc/squid3/squid.conf +++ b/hosts/jenkins-test-vm/etc/squid3/squid.conf @@ -714,7 +714,6 @@ acl Safe_ports port 280 # http-mgmt acl Safe_ports port 488 # gss-http acl Safe_ports port 591 # filemaker acl Safe_ports port 777 # multiling http -acl VNC_ports port 5900-5999 # VNC ports acl CONNECT method CONNECT # TAG: follow_x_forwarded_for @@ -823,7 +822,6 @@ http_access deny manager # Deny requests to certain unsafe ports http_access deny !Safe_ports -http_access allow CONNECT VNC_ports # Deny CONNECT to other than secure SSL ports http_access deny CONNECT !SSL_ports @@ -2232,7 +2230,7 @@ http_port 3128 # Uncomment and adjust the following to add a disk cache directory. #cache_dir ufs /var/spool/squid3 100 16 256 -cache_dir ufs /var/spool/squid3 1000 16 1024 +cache_dir ufs /var/spool/squid3 16384 16 1024 # TAG: store_dir_select_algorithm # Set this to 'round-robin' as an alternative. |