Commit 7a678bff authored by Holger Levsen's avatar Holger Levsen

reproducible: make all nodes at OSUOSL use osuosl167 as proxy

Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent 0e3f6058
...@@ -62,12 +62,10 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian ...@@ -62,12 +62,10 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
=== new nodes at OSUOSL === new nodes at OSUOSL
* debug why munin is broken
* use those nodes...! * use those nodes...!
* tmpfs? * tmpfs?
* add to README and THANKS * add to README and THANKS
* proxy setup how, esp. considering future nodes? * which nodes to run in the future?
* which nodes to run in the future?a
* ask about remote hands * ask about remote hands
* blog post when done * blog post when done
......
...@@ -149,8 +149,8 @@ else ...@@ -149,8 +149,8 @@ else
# let pb7 use its own proxy for the fdroid stuff: # let pb7 use its own proxy for the fdroid stuff:
export http_proxy="http://127.0.0.1:3128" ;; export http_proxy="http://127.0.0.1:3128" ;;
osuosl*) osuosl*)
# for now, use local proxies as a start: # all nodes at OSUOSL use osuosl167 as proxy:
export http_proxy="http://127.0.0.1:3128" ;; export http_proxy="http://10.6.5.46:3128" ;;
codethink*) codethink*)
export http_proxy="http://192.168.101.16:3128" ;; export http_proxy="http://192.168.101.16:3128" ;;
bbx15|cb3*|cbxi4*|wbq0|odxu4*|odu3*|odc*|ff*|ff4*|opi2*|jt?1*|p64*) bbx15|cb3*|cbxi4*|wbq0|odxu4*|odu3*|odc*|ff*|ff4*|opi2*|jt?1*|p64*)
......
Acquire::http::Proxy "http://127.0.0.1:3128/"; Acquire::http::Proxy "http://10.6.5.46:3128/";
...@@ -977,6 +977,7 @@ acl localnet src 10.0.0.0/8 # RFC1918 possible internal network ...@@ -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 192.168.0.0/16 # RFC1918 possible internal network
#acl localnet src fc00::/7 # RFC 4193 local private network range #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 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 SSL_ports port 443
acl Safe_ports port 80 # http acl Safe_ports port 80 # http
......
Acquire::http::Proxy "http://127.0.0.1:3128/"; Acquire::http::Proxy "http://10.6.5.46:3128/";
This diff is collapsed.
Acquire::http::Proxy "http://127.0.0.1:3128/"; Acquire::http::Proxy "http://10.6.5.46:3128/";
This diff is collapsed.
Acquire::http::Proxy "http://127.0.0.1:3128/"; Acquire::http::Proxy "http://10.6.5.46:3128/";
This diff is collapsed.
Acquire::http::Proxy "http://127.0.0.1:3128/"; Acquire::http::Proxy "http://10.6.5.46:3128/";
This diff is collapsed.
Acquire::http::Proxy "http://127.0.0.1:3128/"; Acquire::http::Proxy "http://10.6.5.46:3128/";
This diff is collapsed.
Acquire::http::Proxy "http://127.0.0.1:3128/"; Acquire::http::Proxy "http://10.6.5.46:3128/";
This diff is collapsed.
Acquire::http::Proxy "http://127.0.0.1:3128/"; Acquire::http::Proxy "http://10.6.5.46:3128/";
This diff is collapsed.
...@@ -286,7 +286,7 @@ if [ -f /etc/debian_version ] ; then ...@@ -286,7 +286,7 @@ if [ -f /etc/debian_version ] ; then
" "
# install squid on a few nodes only # install squid on a few nodes only
case $HOSTNAME in 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" ;; squid" ;;
*) ;; *) ;;
esac esac
...@@ -568,7 +568,7 @@ if ! $UP2DATE || [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] ; then ...@@ -568,7 +568,7 @@ if ! $UP2DATE || [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] ; then
cd /etc/munin/plugins 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 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 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 esac
case $HOSTNAME in case $HOSTNAME in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment