From 44bee4e3ff3d99b2a8bc654fc8a830cf1b5d519f Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Thu, 18 Aug 2016 15:13:43 -0700
Subject: [PATCH 1/4] zt-kubernetes tutorial update

---
 doc/ext/kubernetes/Dockerfile    |  2 +-
 doc/ext/kubernetes/entrypoint.sh | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/doc/ext/kubernetes/Dockerfile b/doc/ext/kubernetes/Dockerfile
index 74af6c1ac..bfe09e3e6 100644
--- a/doc/ext/kubernetes/Dockerfile
+++ b/doc/ext/kubernetes/Dockerfile
@@ -4,7 +4,7 @@ EXPOSE 8080/tcp 9993/udp
 # Install ZT network conf files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD zerotier /
+ADD zerotier-one /
 ADD zerotier-cli /
 ADD .zerotierCliSettings /
 
diff --git a/doc/ext/kubernetes/entrypoint.sh b/doc/ext/kubernetes/entrypoint.sh
index 881d92cfa..59f7ad4ae 100644
--- a/doc/ext/kubernetes/entrypoint.sh
+++ b/doc/ext/kubernetes/entrypoint.sh
@@ -1,23 +1,21 @@
+#!/bin/bash
+
 echo '*** ZeroTier-Kubernetes self-auth test script'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-virtip4=""
-while [ -z "$virtip4" ]; do
-	sleep 0.2
-	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
-	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
-done
-echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+dev=""
 
-echo '*** Self-Authorizing to deployment network'
 nwconf=$(ls *.conf)
 nwid="${nwconf%.*}"
 
+sleep 10
+dev=$(cat /var/lib/zerotier-one/identity.public| cut -d ':' -f 1)
+
+echo '*** Joining'
+./zerotier-cli join "$nwid".conf
 AUTHTOKEN=$(cat /var/lib/zerotier-one/authtoken.secret)
 sed "s|\local_service_auth_token|${AUTHTOKEN}|" .zerotierCliSettings > /root/.zerotierCliSettings
-
-./zerotier-cli join $(nwid).conf
-./zerotier-cli net-auth $(nwid) $(dev)
-
-# node server.js
\ No newline at end of file
+echo '*** Authorizing'
+./zerotier-cli net-auth @my.zerotier.com "$nwid" "$dev"
+node server.js
\ No newline at end of file

From cf2ec0797e78f83d930ee2907d736f84f0be5189 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Thu, 18 Aug 2016 15:15:38 -0700
Subject: [PATCH 2/4] zt-kubernetes tutorial update

---
 doc/ext/kubernetes/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ext/kubernetes/entrypoint.sh b/doc/ext/kubernetes/entrypoint.sh
index 59f7ad4ae..e94363d60 100644
--- a/doc/ext/kubernetes/entrypoint.sh
+++ b/doc/ext/kubernetes/entrypoint.sh
@@ -15,7 +15,7 @@ dev=$(cat /var/lib/zerotier-one/identity.public| cut -d ':' -f 1)
 echo '*** Joining'
 ./zerotier-cli join "$nwid".conf
 AUTHTOKEN=$(cat /var/lib/zerotier-one/authtoken.secret)
-sed "s|\local_service_auth_token|${AUTHTOKEN}|" .zerotierCliSettings > /root/.zerotierCliSettings
+sed "s|\local_service_auth_token_replaced_automatically|${AUTHTOKEN}|" .zerotierCliSettings > /root/.zerotierCliSettings
 echo '*** Authorizing'
 ./zerotier-cli net-auth @my.zerotier.com "$nwid" "$dev"
 node server.js
\ No newline at end of file

From c2f10a52deb8eb055bcb99b994cfd18affba3066 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Thu, 18 Aug 2016 15:16:24 -0700
Subject: [PATCH 3/4] zt-kubernetes tutorial update

---
 doc/ext/kubernetes/.zerotierCliSettings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ext/kubernetes/.zerotierCliSettings b/doc/ext/kubernetes/.zerotierCliSettings
index abe4cf6c4..86fc3a390 100644
--- a/doc/ext/kubernetes/.zerotierCliSettings
+++ b/doc/ext/kubernetes/.zerotierCliSettings
@@ -5,7 +5,7 @@
   "defaultOne": "@local",
   "things": {
     "local": {
-      "auth": "XXXXXXXXXXXXXXXXXXXXXXXX",
+      "auth": "local_service_auth_token_replaced_automatically",
       "type": "one",
       "url": "http://127.0.0.1:9993/"
     },

From 727fb197d8ee9f536fb8f06e00a15599332421c7 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Thu, 18 Aug 2016 15:32:26 -0700
Subject: [PATCH 4/4] kube tutorial update

---
 doc/ext/kubernetes/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/ext/kubernetes/Dockerfile b/doc/ext/kubernetes/Dockerfile
index bfe09e3e6..6437a2bbe 100644
--- a/doc/ext/kubernetes/Dockerfile
+++ b/doc/ext/kubernetes/Dockerfile
@@ -4,6 +4,7 @@ EXPOSE 8080/tcp 9993/udp
 # Install ZT network conf files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
 ADD zerotier-one /
 ADD zerotier-cli /
 ADD .zerotierCliSettings /