From 169664ffc2c281500a396588df2d5724a79b5723 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Wed, 17 Aug 2016 17:43:34 -0700
Subject: [PATCH 1/4] examples files for kube int

---
 doc/ext/kubernetes/Dockerfile    |  2 +-
 doc/ext/kubernetes/entrypoint.sh | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/doc/ext/kubernetes/Dockerfile b/doc/ext/kubernetes/Dockerfile
index ee2b8dab5..c33b6babc 100644
--- a/doc/ext/kubernetes/Dockerfile
+++ b/doc/ext/kubernetes/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD zerotier /
 ADD zerotier-cli /
-ADD .zerotierCliSettings <settings path>?>
+ADD .zerotierCliSettings /root/
 
 # Install App
 ADD server.js /
diff --git a/doc/ext/kubernetes/entrypoint.sh b/doc/ext/kubernetes/entrypoint.sh
index 7d4242c8b..cc5471168 100644
--- a/doc/ext/kubernetes/entrypoint.sh
+++ b/doc/ext/kubernetes/entrypoint.sh
@@ -1,5 +1,16 @@
-./zerotier 
-zerotier-cli join $(NWID).conf
-zerotier-cli net-auth $(NWID) $(DEVID)
+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`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+
+echo '*** Self-Authorizing to deployment network'
+./zerotier-cli join $(NWID).conf
+./zerotier-cli net-auth $(NWID) $(DEVID)
 
 # node server.js
\ No newline at end of file

From 9dc507c9ae902190f628605553f9a6b781d7e18a Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Wed, 17 Aug 2016 17:52:19 -0700
Subject: [PATCH 2/4] examples files for kube int

---
 doc/ext/kubernetes/entrypoint.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/ext/kubernetes/entrypoint.sh b/doc/ext/kubernetes/entrypoint.sh
index cc5471168..7509f3ce0 100644
--- a/doc/ext/kubernetes/entrypoint.sh
+++ b/doc/ext/kubernetes/entrypoint.sh
@@ -6,11 +6,15 @@ 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
 
 echo '*** Self-Authorizing to deployment network'
-./zerotier-cli join $(NWID).conf
-./zerotier-cli net-auth $(NWID) $(DEVID)
+nwconf=$(ls *.conf)
+nwid="${nwconf%.*}"
+
+./zerotier-cli join $(nwid).conf
+./zerotier-cli net-auth $(nwid) $(dev)
 
 # node server.js
\ No newline at end of file

From 0fd3afe2c8bfc2f12af0e1e546f36d03c6f0b2a6 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Wed, 17 Aug 2016 18:03:34 -0700
Subject: [PATCH 3/4] examples files for kube int

---
 doc/ext/kubernetes/entrypoint.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/ext/kubernetes/entrypoint.sh b/doc/ext/kubernetes/entrypoint.sh
index 7509f3ce0..8ec7312aa 100644
--- a/doc/ext/kubernetes/entrypoint.sh
+++ b/doc/ext/kubernetes/entrypoint.sh
@@ -13,6 +13,9 @@ echo '*** Up and running at' $virtip4 ' on network: ' $nwid
 echo '*** Self-Authorizing to deployment network'
 nwconf=$(ls *.conf)
 nwid="${nwconf%.*}"
+AUTHTOKEN="(cat /var/lib/zerotier-one/authtoken.secret)"
+
+grep -rl 'local_service_auth_token' ./ | xargs sed -i 's/local_service_auth_token/' $AUTHTOKEN '/g'
 
 ./zerotier-cli join $(nwid).conf
 ./zerotier-cli net-auth $(nwid) $(dev)

From 3e261fb999895d32e1253098d7f28933f50782a4 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Wed, 17 Aug 2016 18:33:49 -0700
Subject: [PATCH 4/4] updated entrypoint

---
 doc/ext/kubernetes/Dockerfile    | 2 +-
 doc/ext/kubernetes/entrypoint.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/ext/kubernetes/Dockerfile b/doc/ext/kubernetes/Dockerfile
index c33b6babc..74af6c1ac 100644
--- a/doc/ext/kubernetes/Dockerfile
+++ b/doc/ext/kubernetes/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD zerotier /
 ADD zerotier-cli /
-ADD .zerotierCliSettings /root/
+ADD .zerotierCliSettings /
 
 # Install App
 ADD server.js /
diff --git a/doc/ext/kubernetes/entrypoint.sh b/doc/ext/kubernetes/entrypoint.sh
index 8ec7312aa..881d92cfa 100644
--- a/doc/ext/kubernetes/entrypoint.sh
+++ b/doc/ext/kubernetes/entrypoint.sh
@@ -13,9 +13,9 @@ echo '*** Up and running at' $virtip4 ' on network: ' $nwid
 echo '*** Self-Authorizing to deployment network'
 nwconf=$(ls *.conf)
 nwid="${nwconf%.*}"
-AUTHTOKEN="(cat /var/lib/zerotier-one/authtoken.secret)"
 
-grep -rl 'local_service_auth_token' ./ | xargs sed -i 's/local_service_auth_token/' $AUTHTOKEN '/g'
+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)