From ae3c4099b341917dfabfd90c99e9feebc063b9f5 Mon Sep 17 00:00:00 2001
From: Mike Thomas <mike@whatang.org>
Date: Sat, 17 Nov 2018 21:55:46 +0000
Subject: [PATCH] Enable serving the tiddlywiki at a non-root path

---
 Dockerfile        |  1 +
 init-and-run-wiki | 21 ++++++++++++++++++++-
 tiddlyweb_host    |  4 ++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 tiddlyweb_host

diff --git a/Dockerfile b/Dockerfile
index a79b22f..34467d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ VOLUME /var/lib/tiddlywiki
 WORKDIR /var/lib/tiddlywiki
 
 # Add init-and-run script
+ADD tiddlyweb_host /tiddlyweb_host_template
 ADD init-and-run-wiki /usr/local/bin/init-and-run-wiki
 
 # Meta
diff --git a/init-and-run-wiki b/init-and-run-wiki
index ce1fd5b..d5036e6 100755
--- a/init-and-run-wiki
+++ b/init-and-run-wiki
@@ -12,7 +12,26 @@ fi
 
 if [ ! -d /var/lib/tiddlywiki/mywiki ]; then
   /usr/bin/env node $NODEJS_V8_ARGS $tiddlywiki_script mywiki --init server
+
+  mkdir /var/lib/tiddlywiki/mywiki/tiddlers
 fi
 
-exec /usr/bin/env node $NODEJS_V8_ARGS $tiddlywiki_script mywiki --server 8080 $:/core/save/all text/plain text/html ${USERNAME:-user} ${PASSWORD:-'wiki'} 0.0.0.0
+
+# Configure the tiddlywiki to be served on a path if it is given
+WEBHOST_TID=/var/lib/tiddlywiki/mywiki/tiddlers/\$__config_tiddlyweb_host.tid
+if [ -n "${SERVE_URI}" ]
+then
+  cp /tiddlyweb_host_template ${WEBHOST_TID}
+  echo '$protocol$//$host$'${SERVE_URI}"/" >> ${WEBHOST_TID}
+  echo "tiddlywiki will be served at ${SERVE_URI}"
+else
+  if [ -e ${WEBHOST_TID} ]
+  then
+    rm ${WEBHOST_TID}
+  fi
+fi
+
+# Start the tiddlywiki server
+
+exec /usr/bin/env node $NODEJS_V8_ARGS $tiddlywiki_script mywiki --server 8080 $:/core/save/all text/plain text/html ${USERNAME:-user} ${PASSWORD:-'wiki'} 0.0.0.0 ${SERVE_URI}
 
diff --git a/tiddlyweb_host b/tiddlyweb_host
new file mode 100644
index 0000000..ccc6b36
--- /dev/null
+++ b/tiddlyweb_host
@@ -0,0 +1,4 @@
+title: $:/config/tiddlyweb/host
+type: text/vnd.tiddlywiki
+
+