commit 9f9c5d9b275b74beb1bcbab12be74a3d1488a5b2
author Han-Wen Nienhuys <hanwen@google.com> Wed Apr 18 09:29:28 2018 +0200
committer David Pursehouse <dpursehouse@collab.net> Wed Apr 18 13:38:10 2018 +0000
tree d8a4c80be69b7627c9a1d9dad668af25e1cc6a41
parent 0e73105b2f4a47bb1b2793770a180a47d6435f77

Add IPv4 forwarding, start tunnel and make script idempotent.

Change-Id: Icf225753880d03fe11e3840573f2a51e986e6b55

worker/setup.sh

diff --git a/worker/setup.sh b/worker/setup.sh
index 0654469..21fd9f6 100755
--- a/worker/setup.sh
+++ b/worker/setup.sh
@@ -6,17 +6,24 @@
 mkdir -p .ssh
 
 # recognize gerritforge.
-echo '[gerrit-ci.gerritforge.com]:1022,[8.26.94.23]:1022 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUylKwtTDROpPce/sCfdMMR+N116TsZx5n4YHO8qPLaEhEXld+1T+hWe/HuITafW182hTnOjMHlK/GwH9A7KOS9XHHdBtHCYx0lH78kb+fvZsUtyuGlbQNXzQuyBIpJoYOtMRhn5aHR1sn1USHnnZp1V1dpDu/HYHjpj4pyA8I4i2BE89OVblxyggdulvgLfaLFJ+6Q9U+Mf+SHpufgsXDNlG/KTQVHioONoOnu47qbhJLSK+w5Q3dzaLa2CTPCZgdOFf3g6AQJWMKDEkTnReT9bR97lg1T59GoK2pLpem1gokiUQ052/qH/cL/b38XtW/IJCK9HmrV5Whc26dDg95' > .ssh/known_hosts
+if ! grep --quiet 'gerrit-ci' .ssh/known_hosts ; then
+    echo '[gerrit-ci.gerritforge.com]:1022,[8.26.94.23]:1022 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUylKwtTDROpPce/sCfdMMR+N116TsZx5n4YHO8qPLaEhEXld+1T+hWe/HuITafW182hTnOjMHlK/GwH9A7KOS9XHHdBtHCYx0lH78kb+fvZsUtyuGlbQNXzQuyBIpJoYOtMRhn5aHR1sn1USHnnZp1V1dpDu/HYHjpj4pyA8I4i2BE89OVblxyggdulvgLfaLFJ+6Q9U+Mf+SHpufgsXDNlG/KTQVHioONoOnu47qbhJLSK+w5Q3dzaLa2CTPCZgdOFf3g6AQJWMKDEkTnReT9bR97lg1T59GoK2pLpem1gokiUQ052/qH/cL/b38XtW/IJCK9HmrV5Whc26dDg95' >> .ssh/known_hosts
+fi
 
 # Docker on port 2375
-found=$(grep -l 2375 /lib/systemd/system/docker.service)
-if [[ -z "$found" ]] ; then 
+if ! grep --quiet 2375 /lib/systemd/system/docker.service; then
   sed -i 's|$OPTIONS|$OPTIONS -H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375|' /lib/systemd/system/docker.service
 fi
 
+if ! grep --quiet net.ipv4.ip_forward=1 /etc/sysctl.conf; then
+    echo 'net.ipv4.ip_forward=1' >> /etc/sysctl.conf
+    sysctl net.ipv4.ip_forward=1
+fi
+
 cp $(dirname $0)/setup-tunnel.service /etc/systemd/system/
 
 systemctl daemon-reload
-systemctl enable setup-tunnel.service
 systemctl start docker
 systemctl restart docker
+systemctl enable setup-tunnel.service
+systemctl start setup-tunnel.service