From 93403ef7c348976ba221dd3fb4321008da2e4caf Mon Sep 17 00:00:00 2001
From: Ivo Kubjas <ivo@teokon.eu>
Date: Mon, 17 May 2021 00:45:16 +0200
Subject: [PATCH 1/2] add icons

---
 Makefile                 |   2 +-
 build/build-qpkg.sh      |   4 ++++
 icons/Tailscale.gif      | Bin 0 -> 1855 bytes
 icons/Tailscale_80.gif   | Bin 0 -> 2430 bytes
 icons/Tailscale_gray.gif | Bin 0 -> 1855 bytes
 5 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 icons/Tailscale.gif
 create mode 100644 icons/Tailscale_80.gif
 create mode 100644 icons/Tailscale_gray.gif

diff --git a/Makefile b/Makefile
index c8d6a02..eb8b1a7 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ build-qdk-container:
 
 .PHONY: out/pkg
 out/pkg: build-qdk-container out/tailscaled
-	docker run --rm -v ${CURDIR}/out:/out -e TSTAG=${TSTAG} qdk:latest
+	docker run --rm -v ${CURDIR}/out:/out -v ${CURDIR}/icons:/icons -e TSTAG=${TSTAG} qdk:latest
 
 .PHONY: clean
 clean:
diff --git a/build/build-qpkg.sh b/build/build-qpkg.sh
index 7d9e666..051bd44 100755
--- a/build/build-qpkg.sh
+++ b/build/build-qpkg.sh
@@ -25,6 +25,10 @@ cp out/tailscale-arm64 /Tailscale/arm_64/tailscale
 
 mkdir -p /Tailscale/shared/var/run/tailscale
 mkdir -p /Tailscale/shared/var/lib/tailscale
+mkdir -p /Tailscale/icons/
+cp icons/Tailscale.gif /Tailscale/icons/
+cp icons/Tailscale_gray.gif /Tailscale/icons/
+cp icons/Tailscale_80.gif /Tailscale/icons/
 
 sed -i '/#QPKG_REQUIRE/cQPKG_REQUIRE="QVPN"' /Tailscale/qpkg.cfg
 
diff --git a/icons/Tailscale.gif b/icons/Tailscale.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4b0ef7ec75d4140d8188cf13deac282fe335e94c
GIT binary patch
literal 1855
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
OOsoqxbv!5l;Pemq72Q4n

literal 0
HcmV?d00001

diff --git a/icons/Tailscale_80.gif b/icons/Tailscale_80.gif
new file mode 100644
index 0000000000000000000000000000000000000000..76e052f3b986256ad75457e65009b2c8755201b4
GIT binary patch
literal 2430
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
Ygj?8NYv}#XGi38g`J;AS2ng8!3uNR8i~s-t

literal 0
HcmV?d00001

diff --git a/icons/Tailscale_gray.gif b/icons/Tailscale_gray.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4b0ef7ec75d4140d8188cf13deac282fe335e94c
GIT binary patch
literal 1855
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
OOsoqxbv!5l;Pemq72Q4n

literal 0
HcmV?d00001


From b10d7edc3d504a0bf159e7fe3c0e9ba5ed5cf5c3 Mon Sep 17 00:00:00 2001
From: Ivo Kubjas <ivo@teokon.eu>
Date: Mon, 17 May 2021 00:46:01 +0200
Subject: [PATCH 2/2] reverse proxy Tailscale web ui

---
 build/build-qpkg.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/build-qpkg.sh b/build/build-qpkg.sh
index 051bd44..6c69d8b 100755
--- a/build/build-qpkg.sh
+++ b/build/build-qpkg.sh
@@ -31,6 +31,10 @@ cp icons/Tailscale_gray.gif /Tailscale/icons/
 cp icons/Tailscale_80.gif /Tailscale/icons/
 
 sed -i '/#QPKG_REQUIRE/cQPKG_REQUIRE="QVPN"' /Tailscale/qpkg.cfg
+sed -i '/#QPKG_WEBUI/cQPKG_WEBUI=""' /Tailscale/qpkg.cfg
+sed -i '/#QPKG_WEB_PORT/cQPKG_WEB_PORT="50992"' /Tailscale/qpkg.cfg
+sed -i '/#QPKG_USE_PROXY/cQPKG_USE_PROXY="1"' /Tailscale/qpkg.cfg
+sed -i '/#QPKG_PROXY_PATH/cQPKG_PROXY_PATH="/tailscaleweb/"' /Tailscale/qpkg.cfg
 
 sed -i '/: ADD START ACTIONS HERE/c\
     $QPKG_ROOT/tailscaled --port 41641 --state=$QPKG_ROOT/var/lib/tailscale/tailscaled.state --socket=$QPKG_ROOT/var/run/tailscale/tailscaled.sock 2> /dev/null &\