[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: make all nodes at OSUOSL use osuosl167 as proxy

Holger Levsen gitlab at salsa.debian.org
Wed Dec 19 09:43:45 GMT 2018


Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
7a678bff by Holger Levsen at 2018-12-19T09:42:58Z
reproducible: make all nodes at OSUOSL use osuosl167 as proxy

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


19 changed files:

- TODO
- bin/common-functions.sh
- hosts/osuosl-build167-amd64/etc/apt/apt.conf.d/80proxy
- hosts/osuosl-build167-amd64/etc/squid/squid.conf
- hosts/osuosl-build168-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl-build168-amd64/etc/squid/squid.conf
- hosts/osuosl-build169-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl-build169-amd64/etc/squid/squid.conf
- hosts/osuosl-build170-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl-build170-amd64/etc/squid/squid.conf
- hosts/osuosl-build171-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl-build171-amd64/etc/squid/squid.conf
- hosts/osuosl-build172-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl-build172-amd64/etc/squid/squid.conf
- hosts/osuosl-build173-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl-build173-amd64/etc/squid/squid.conf
- hosts/osuosl-build174-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl-build174-amd64/etc/squid/squid.conf
- update_jdn.sh


Changes:

=====================================
TODO
=====================================
@@ -62,12 +62,10 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 
 === new nodes at OSUOSL
 
-* debug why munin is broken
 * use those nodes...!
 * tmpfs?
 * add to README and THANKS
-* proxy setup how, esp. considering future nodes?
-* which nodes to run in the future?a
+* which nodes to run in the future?
 * ask about remote hands
 * blog post when done
 


=====================================
bin/common-functions.sh
=====================================
@@ -149,8 +149,8 @@ else
 			# let pb7 use its own proxy for the fdroid stuff:
 			export http_proxy="http://127.0.0.1:3128" ;;
 		osuosl*)
-			# for now, use local proxies as a start:
-			export http_proxy="http://127.0.0.1:3128" ;;
+			# all nodes at OSUOSL use osuosl167 as proxy:
+			export http_proxy="http://10.6.5.46:3128" ;;
 		codethink*)
 			export http_proxy="http://192.168.101.16:3128" ;;
 		bbx15|cb3*|cbxi4*|wbq0|odxu4*|odu3*|odc*|ff*|ff4*|opi2*|jt?1*|p64*)


=====================================
hosts/osuosl-build167-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";
+Acquire::http::Proxy "http://10.6.5.46:3128/";


=====================================
hosts/osuosl-build167-amd64/etc/squid/squid.conf
=====================================
@@ -977,6 +977,7 @@ acl localnet src 10.0.0.0/8	# RFC1918 possible internal network
 #acl localnet src 192.168.0.0/16	# RFC1918 possible internal network
 #acl localnet src fc00::/7       # RFC 4193 local private network range
 #acl localnet src fe80::/10      # RFC 4291 link-local (directly plugged) machines
+acl localnet src 10.6.4.0/22	# OSUOSL nodes
 
 acl SSL_ports port 443
 acl Safe_ports port 80		# http


=====================================
hosts/osuosl-build168-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";
+Acquire::http::Proxy "http://10.6.5.46:3128/";


=====================================
hosts/osuosl-build168-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/osuosl-build169-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";
+Acquire::http::Proxy "http://10.6.5.46:3128/";


=====================================
hosts/osuosl-build169-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/osuosl-build170-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";
+Acquire::http::Proxy "http://10.6.5.46:3128/";


=====================================
hosts/osuosl-build170-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/osuosl-build171-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";
+Acquire::http::Proxy "http://10.6.5.46:3128/";


=====================================
hosts/osuosl-build171-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/osuosl-build172-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";
+Acquire::http::Proxy "http://10.6.5.46:3128/";


=====================================
hosts/osuosl-build172-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/osuosl-build173-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";
+Acquire::http::Proxy "http://10.6.5.46:3128/";


=====================================
hosts/osuosl-build173-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
hosts/osuosl-build174-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:3128/";
+Acquire::http::Proxy "http://10.6.5.46:3128/";


=====================================
hosts/osuosl-build174-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.

=====================================
update_jdn.sh
=====================================
@@ -286,7 +286,7 @@ if [ -f /etc/debian_version ] ; then
 			"
 		# install squid on a few nodes only
 		case $HOSTNAME in
-			profitbricks-build1-a*|profitbricks-build10*|profitbricks-build7*|codethink-sled16*|osuosl*) DEBS="$DEBS
+			profitbricks-build1-a*|profitbricks-build10*|profitbricks-build7*|codethink-sled16*|osuosl-build167*) DEBS="$DEBS
 				squid" ;;
 			*) ;;
 		esac
@@ -568,7 +568,7 @@ if ! $UP2DATE || [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] ; then
 	cd /etc/munin/plugins
 	sudo rm -f postfix_* open_inodes interrupts irqstats threads proc_pri vmstat if_err_* exim_* netstat fw_forwarded_local fw_packets forks open_files users nfs* iostat_ios ntp* 2>/dev/null
 	case $HOSTNAME in
-			profitbricks-build7*|profitbricks-build1-a*|profitbricks-build10*|codethink-sled16*|osuosl*) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;;
+			profitbricks-build7*|profitbricks-build1-a*|profitbricks-build10*|codethink-sled16*|osuosl-build167*) [ -L /etc/munin/plugins/squid_cache ] || for i in squid_cache squid_objectsize squid_requests squid_traffic ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done ;;
 			*)	;;
 	esac
 	case $HOSTNAME in



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/7a678bff7914ae9e7cba29ba7775a87498d22e7b

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/7a678bff7914ae9e7cba29ba7775a87498d22e7b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181219/d528dc80/attachment-0001.html>


More information about the Qa-jenkins-scm mailing list