script/vagrant: extract APT proxy setup

Antonio Terceiro
1 parent 71178d9a
Showing 2 changed files with 17 additions and 10 deletions Show diff stats
script/set-apt-proxy
script/vagrant
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+sudo apt-get install -qy netcat-traditional
+
+# apt-cacher-ng running on the host
+# 10.0.2.2 = host ip on virtualbox/qemu
+# 192.168..122.1 = host ip on default libvirt bridge
+# 172.17.42.1 = host ip on default docker bridge
+for ip in 10.0.2.2 192.168.122.1 172.17.42.1; do
+  if nc -z -w 1 $ip 3142; then
+    echo "Acquire::http::Proxy \"http://$ip:3142\";" | sudo tee /etc/apt/apt.conf.d/01proxy
+  fi
+done
 #!/bin/sh
 set -e
-sudo apt-get install netcat-traditional
-# apt-cacher-ng running on the host
-# 10.0.2.2 = host ip on virtualbox/qemu
-# 192.168..122.1 = host ip on default libvirt bridge
-for ip in 10.0.2.2 192.168.122.1; do
-  if nc -z -w 1 $ip 3142; then
-    echo "Acquire::http::Proxy \"http://$ip:3142\";" | sudo tee /etc/apt/apt.conf.d/01proxy
-  fi
-done
+cd /vagrant
+./script/set-apt-proxy
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -qy postfix
 sudo postconf virtual_alias_maps=hash:/etc/postfix/virtual
@@ -20,5 +13,4 @@ EOF
 sudo postmap /etc/postfix/virtual
 sudo service postfix reload
-cd /vagrant
 ./script/quick-start
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+#!/bin/sh
	2	+
	3	+set -e
	4	+
	5	+sudo apt-get install -qy netcat-traditional
	6	+
	7	+# apt-cacher-ng running on the host
	8	+# 10.0.2.2 = host ip on virtualbox/qemu
	9	+# 192.168..122.1 = host ip on default libvirt bridge
	10	+# 172.17.42.1 = host ip on default docker bridge
	11	+for ip in 10.0.2.2 192.168.122.1 172.17.42.1; do
	12	+ if nc -z -w 1 $ip 3142; then
	13	+ echo "Acquire::http::Proxy \"http://$ip:3142\";" \| sudo tee /etc/apt/apt.conf.d/01proxy
	14	+ fi
	15	+done
1	#!/bin/sh	1	#!/bin/sh
2		2
3	set -e	3	set -e
4	-sudo apt-get install netcat-traditional
5		4
6	-# apt-cacher-ng running on the host
7	-# 10.0.2.2 = host ip on virtualbox/qemu
8	-# 192.168..122.1 = host ip on default libvirt bridge
9	-for ip in 10.0.2.2 192.168.122.1; do
10	- if nc -z -w 1 $ip 3142; then
11	- echo "Acquire::http::Proxy \"http://$ip:3142\";" \| sudo tee /etc/apt/apt.conf.d/01proxy
12	- fi
13	-done	5	+cd /vagrant
		6	+./script/set-apt-proxy
14		7
15	sudo DEBIAN_FRONTEND=noninteractive apt-get install -qy postfix	8	sudo DEBIAN_FRONTEND=noninteractive apt-get install -qy postfix
16	sudo postconf virtual_alias_maps=hash:/etc/postfix/virtual	9	sudo postconf virtual_alias_maps=hash:/etc/postfix/virtual
	@@ -20,5 +13,4 @@ EOF		@@ -20,5 +13,4 @@ EOF
20	sudo postmap /etc/postfix/virtual	13	sudo postmap /etc/postfix/virtual
21	sudo service postfix reload	14	sudo service postfix reload
22		15
23	-cd /vagrant
24	./script/quick-start	16	./script/quick-start