Holger Levsen · Holger Levsen · Holger Levsen · f923a9d1 · f8fe604d · f8fe604d
--- a/bin/common-functions.sh
+++ b/bin/common-functions.sh
@@ -139,8 +139,15 @@ else
 	fi
 	if [ -z "$http_proxy" ]; then
 		case $HOSTNAME in
-			jenkins|jenkins-test-vm|profitbricks-build*)
-				export http_proxy="http://localhost:3128" ;;
+			jenkins|jenkins-test-vm|profitbricks-build1-a*|profitbricks-build2*|profitbricks-build3*|profitbricks-build9*|profitbricks-build11*|profitbricks-build12*)
+				# pb datacenter in karlsruhe uses pb1 as proxy:
+				export http_proxy="http://78.137.99.97:3128" ;;
+			profitbricks-build4*|profitbricks-build5*|profitbricks-build6*|profitbricks-build10*|profitbricks-build15*|profitbricks-build16*)
+				# pb datacenter in frankfurt uses pb10 as proxy:
+				export http_proxy="http://85.184.249.68:3128" ;;
+			profitbricks-build7*)
+				# let pb7 use its own proxy for the fdroid stuff:
+				export http_proxy="http://127.0.0.1:3128" ;;
 			codethink*)
 				export http_proxy="http://192.168.101.16:3128" ;;
 			bbx15|cb3*|cbxi4*|wbq0|odxu4*|odu3*|odc*|ff*|ff4*|opi2*|jt?1*|p64*)

--- a/hosts/common-amd64/etc/squid/squid.conf
+++ b/hosts/common-amd64/etc/squid/squid.conf
--- a/hosts/common-arm64/etc/squid/squid.conf
+++ b/hosts/common-arm64/etc/squid/squid.conf
--- a/hosts/common-i386/etc/squid/squid.conf
+++ b/hosts/common-i386/etc/squid/squid.conf
--- a/hosts/jenkins-test-vm/etc/apt/apt.conf.d/80proxy
+++ b/hosts/jenkins-test-vm/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://78.137.99.97:3128/";
--- a/hosts/jenkins/etc/apt/apt.conf.d/80proxy
+++ b/hosts/jenkins/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://78.137.99.97:3128/";
--- a/hosts/jenkins/etc/squid/squid.conf
+++ b/hosts/jenkins/etc/squid/squid.conf
--- a/hosts/profitbricks-build1-amd64/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build1-amd64/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://78.137.99.97:3128/";
--- a/hosts/profitbricks-build10-amd64/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build10-amd64/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://85.184.249.68:3128/";
--- a/hosts/profitbricks-build11-amd64/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build11-amd64/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://78.137.99.97:3128/";
--- a/hosts/profitbricks-build12-i386/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build12-i386/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://78.137.99.97:3128/";
--- a/hosts/profitbricks-build15-amd64/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build15-amd64/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://85.184.249.68:3128/";
--- a/hosts/profitbricks-build16-i386/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build16-i386/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://85.184.249.68:3128/";
--- a/hosts/profitbricks-build2-i386/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build2-i386/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://78.137.99.97:3128/";
--- a/hosts/profitbricks-build3-amd64/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build3-amd64/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://78.137.99.97:3128/";
--- a/hosts/profitbricks-build3-amd64/etc/squid/squid.conf
+++ b/hosts/profitbricks-build3-amd64/etc/squid/squid.conf
--- a/hosts/profitbricks-build4-amd64/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build4-amd64/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://85.184.249.68:3128/";
--- a/hosts/profitbricks-build4-amd64/etc/squid/squid.conf
+++ b/hosts/profitbricks-build4-amd64/etc/squid/squid.conf
--- a/hosts/profitbricks-build5-amd64/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build5-amd64/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://85.184.249.68:3128/";
--- a/hosts/profitbricks-build6-i386/etc/apt/apt.conf.d/80proxy
+++ b/hosts/profitbricks-build6-i386/etc/apt/apt.conf.d/80proxy
+Acquire::http::Proxy "http://85.184.249.68:3128/";